diff --git a/[refs] b/[refs] index 793148b9f5db..f8151dfc9928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 253a8b1db1af146d3a7eef0f3626781df12c7141 +refs/heads/master: d6aafa65354cd2dbb089ab9e7dc618f22230fe32 diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c index ab7c9935c29a..f321c0c49f46 100644 --- a/trunk/security/selinux/selinuxfs.c +++ b/trunk/security/selinux/selinuxfs.c @@ -1151,22 +1151,19 @@ static int sel_make_avc_files(struct dentry *dir) dentry = d_alloc_name(dir, files[i].name); if (!dentry) { ret = -ENOMEM; - goto err; + goto out; } inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode); if (!inode) { ret = -ENOMEM; - goto err; + goto out; } inode->i_fop = files[i].ops; d_add(dentry, inode); } out: return ret; -err: - d_genocide(dir); - goto out; } static int sel_make_dir(struct super_block *sb, struct dentry *dentry)