Revert "UBUNTU: SAUCE: apparmor: fix not handling error case when securityfs_pin_fs() fails"

BugLink: http://bugs.launchpad.net/bugs/1669611

This reverts commit 40f7a7e0.
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Acked-by: default avatarJoseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
parent 4576a3df
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment