aboutsummaryrefslogtreecommitdiffstats
path: root/security/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/inode.c')
-rw-r--r--security/inode.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/security/inode.c b/security/inode.c
index 47eb63480dac..49ee51529396 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -44,8 +44,8 @@ static ssize_t default_write_file(struct file *file, const char __user *buf,
44 44
45static int default_open(struct inode *inode, struct file *file) 45static int default_open(struct inode *inode, struct file *file)
46{ 46{
47 if (inode->u.generic_ip) 47 if (inode->i_private)
48 file->private_data = inode->u.generic_ip; 48 file->private_data = inode->i_private;
49 49
50 return 0; 50 return 0;
51} 51}
@@ -64,7 +64,6 @@ static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev)
64 inode->i_mode = mode; 64 inode->i_mode = mode;
65 inode->i_uid = 0; 65 inode->i_uid = 0;
66 inode->i_gid = 0; 66 inode->i_gid = 0;
67 inode->i_blksize = PAGE_CACHE_SIZE;
68 inode->i_blocks = 0; 67 inode->i_blocks = 0;
69 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; 68 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
70 switch (mode & S_IFMT) { 69 switch (mode & S_IFMT) {
@@ -194,7 +193,7 @@ static int create_by_name(const char *name, mode_t mode,
194 * directory dentry if set. If this paramater is NULL, then the 193 * directory dentry if set. If this paramater is NULL, then the
195 * file will be created in the root of the securityfs filesystem. 194 * file will be created in the root of the securityfs filesystem.
196 * @data: a pointer to something that the caller will want to get to later 195 * @data: a pointer to something that the caller will want to get to later
197 * on. The inode.u.generic_ip pointer will point to this value on 196 * on. The inode.i_private pointer will point to this value on
198 * the open() call. 197 * the open() call.
199 * @fops: a pointer to a struct file_operations that should be used for 198 * @fops: a pointer to a struct file_operations that should be used for
200 * this file. 199 * this file.
@@ -240,7 +239,7 @@ struct dentry *securityfs_create_file(const char *name, mode_t mode,
240 if (fops) 239 if (fops)
241 dentry->d_inode->i_fop = fops; 240 dentry->d_inode->i_fop = fops;
242 if (data) 241 if (data)
243 dentry->d_inode->u.generic_ip = data; 242 dentry->d_inode->i_private = data;
244 } 243 }
245exit: 244exit:
246 return dentry; 245 return dentry;