Revert "UBUNTU: SAUCE: apparmor: fix not handling error case when securityfs_pin_fs...

BugLink: http://bugs.launchpad.net/bugs/1669611
This reverts commit 806f146856b3281d9d92bdd707a1c5ef382f0661.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 5786cca3911a2b19b3217b283cb16aee32c664ce..70a0e6a3c3b9ca1ec7c7d02175553d90d95895f9 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1049,10 +1049,8 @@ static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
         * for pin_fs
         */
        inode_unlock(dir);
-       error = securityfs_pin_fs();
+       securityfs_pin_fs();
        inode_lock_nested(dir, I_MUTEX_PARENT);
-       if (error)
-               return error;
 
        error = __securityfs_setup_d_inode(dir, dentry, mode | S_IFDIR,  NULL,
                                           NULL, NULL);