switch dentry_open() to struct path, make it grab references itself
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -2157,8 +2157,7 @@ static inline void flush_unauthorized_files(const struct cred *cred,
|
||||
get_file(devnull);
|
||||
} else {
|
||||
devnull = dentry_open(
|
||||
dget(selinux_null),
|
||||
mntget(selinuxfs_mount),
|
||||
&selinux_null,
|
||||
O_RDWR, cred);
|
||||
if (IS_ERR(devnull)) {
|
||||
devnull = NULL;
|
||||
|
||||
@@ -221,7 +221,7 @@ extern void selinux_status_update_policyload(int seqno);
|
||||
extern void selinux_complete_init(void);
|
||||
extern int selinux_disable(void);
|
||||
extern void exit_sel_fs(void);
|
||||
extern struct dentry *selinux_null;
|
||||
extern struct path selinux_null;
|
||||
extern struct vfsmount *selinuxfs_mount;
|
||||
extern void selnl_notify_setenforce(int val);
|
||||
extern void selnl_notify_policyload(u32 seqno);
|
||||
|
||||
@@ -1297,7 +1297,7 @@ out:
|
||||
|
||||
#define NULL_FILE_NAME "null"
|
||||
|
||||
struct dentry *selinux_null;
|
||||
struct path selinux_null;
|
||||
|
||||
static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
@@ -1838,7 +1838,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
|
||||
|
||||
init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3));
|
||||
d_add(dentry, inode);
|
||||
selinux_null = dentry;
|
||||
selinux_null.dentry = dentry;
|
||||
|
||||
dentry = sel_make_dir(sb->s_root, "avc", &sel_last_ino);
|
||||
if (IS_ERR(dentry)) {
|
||||
@@ -1912,7 +1912,7 @@ static int __init init_sel_fs(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
selinuxfs_mount = kern_mount(&sel_fs_type);
|
||||
selinux_null.mnt = selinuxfs_mount = kern_mount(&sel_fs_type);
|
||||
if (IS_ERR(selinuxfs_mount)) {
|
||||
printk(KERN_ERR "selinuxfs: could not mount!\n");
|
||||
err = PTR_ERR(selinuxfs_mount);
|
||||
|
||||
Reference in New Issue
Block a user