[PATCH] selinuxfs cleanups: sel_make_avc_files
Fix copy & paste error in sel_make_avc_files(), removing a supurious call to d_genocide() in the error path. All of this will be cleaned up by kill_litter_super(). Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
253a8b1db1
commit
d6aafa6535
|
@ -1151,22 +1151,19 @@ static int sel_make_avc_files(struct dentry *dir)
|
||||||
dentry = d_alloc_name(dir, files[i].name);
|
dentry = d_alloc_name(dir, files[i].name);
|
||||||
if (!dentry) {
|
if (!dentry) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto err;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode);
|
inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode);
|
||||||
if (!inode) {
|
if (!inode) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto err;
|
goto out;
|
||||||
}
|
}
|
||||||
inode->i_fop = files[i].ops;
|
inode->i_fop = files[i].ops;
|
||||||
d_add(dentry, inode);
|
d_add(dentry, inode);
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
return ret;
|
return ret;
|
||||||
err:
|
|
||||||
d_genocide(dir);
|
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sel_make_dir(struct super_block *sb, struct dentry *dentry)
|
static int sel_make_dir(struct super_block *sb, struct dentry *dentry)
|
||||||
|
|
Loading…
Reference in New Issue