aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hppfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-23 17:07:38 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:31 -0500
commit496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch)
tree8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /fs/hppfs
parent57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff)
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hppfs')
-rw-r--r--fs/hppfs/hppfs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
index 43b315f2002b..74f55703be49 100644
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
@@ -180,7 +180,7 @@ static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count,
180 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); 180 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
181 ssize_t n; 181 ssize_t n;
182 182
183 read = file->f_path.dentry->d_inode->i_fop->read; 183 read = file_inode(file)->i_fop->read;
184 184
185 if (!is_user) 185 if (!is_user)
186 set_fs(KERNEL_DS); 186 set_fs(KERNEL_DS);
@@ -288,7 +288,7 @@ static ssize_t hppfs_write(struct file *file, const char __user *buf,
288 struct file *proc_file = data->proc_file; 288 struct file *proc_file = data->proc_file;
289 ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); 289 ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
290 290
291 write = proc_file->f_path.dentry->d_inode->i_fop->write; 291 write = file_inode(proc_file)->i_fop->write;
292 return (*write)(proc_file, buf, len, ppos); 292 return (*write)(proc_file, buf, len, ppos);
293} 293}
294 294
@@ -513,7 +513,7 @@ static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
513 loff_t (*llseek)(struct file *, loff_t, int); 513 loff_t (*llseek)(struct file *, loff_t, int);
514 loff_t ret; 514 loff_t ret;
515 515
516 llseek = proc_file->f_path.dentry->d_inode->i_fop->llseek; 516 llseek = file_inode(proc_file)->i_fop->llseek;
517 if (llseek != NULL) { 517 if (llseek != NULL) {
518 ret = (*llseek)(proc_file, off, where); 518 ret = (*llseek)(proc_file, off, where);
519 if (ret < 0) 519 if (ret < 0)
@@ -561,7 +561,7 @@ static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
561 }); 561 });
562 int err; 562 int err;
563 563
564 readdir = proc_file->f_path.dentry->d_inode->i_fop->readdir; 564 readdir = file_inode(proc_file)->i_fop->readdir;
565 565
566 proc_file->f_pos = file->f_pos; 566 proc_file->f_pos = file->f_pos;
567 err = (*readdir)(proc_file, &dirent, hppfs_filldir); 567 err = (*readdir)(proc_file, &dirent, hppfs_filldir);