new helper: file_inode(file)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 9 insertions, 9 deletions

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 49fe52d25600..b7d3a05c062c 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -397,7 +397,7 @@ static int coda_readdir(struct file *coda_file, void *buf, filldir_t filldir)
                  * We can't use vfs_readdir because we have to keep the file
                  * position in sync between the coda_file and the host_file.
                  * and as such we need grab the inode mutex. */
-                struct inode *host_inode = host_file->f_path.dentry->d_inode;
+                struct inode *host_inode = file_inode(host_file);
 
                 mutex_lock(&host_inode->i_mutex);
                 host_file->f_pos = coda_file->f_pos;
diff --git a/fs/coda/file.c b/fs/coda/file.c
index 8edd404e6419..fa4c100bdc7d 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -66,7 +66,7 @@ coda_file_splice_read(struct file *coda_file, loff_t *ppos,
 static ssize_t
 coda_file_write(struct file *coda_file, const char __user *buf, size_t count, loff_t *ppos)
 {
-        struct inode *host_inode, *coda_inode = coda_file->f_path.dentry->d_inode;
+        struct inode *host_inode, *coda_inode = file_inode(coda_file);
         struct coda_file_info *cfi;
         struct file *host_file;
         ssize_t ret;
@@ -78,7 +78,7 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo
         if (!host_file->f_op || !host_file->f_op->write)
                 return -EINVAL;
 
-        host_inode = host_file->f_path.dentry->d_inode;
+        host_inode = file_inode(host_file);
         mutex_lock(&coda_inode->i_mutex);
 
         ret = host_file->f_op->write(host_file, buf, count, ppos);
@@ -106,8 +106,8 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
         if (!host_file->f_op || !host_file->f_op->mmap)
                 return -ENODEV;
 
-        coda_inode = coda_file->f_path.dentry->d_inode;
-        host_inode = host_file->f_path.dentry->d_inode;
+        coda_inode = file_inode(coda_file);
+        host_inode = file_inode(host_file);
 
         cii = ITOC(coda_inode);
         spin_lock(&cii->c_lock);
@@ -178,7 +178,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
         err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode),
                           coda_flags, coda_file->f_cred->fsuid);
 
-        host_inode = cfi->cfi_container->f_path.dentry->d_inode;
+        host_inode = file_inode(cfi->cfi_container);
         cii = ITOC(coda_inode);
 
         /* did we mmap this file? */
@@ -202,7 +202,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
 int coda_fsync(struct file *coda_file, loff_t start, loff_t end, int datasync)
 {
         struct file *host_file;
-        struct inode *coda_inode = coda_file->f_path.dentry->d_inode;
+        struct inode *coda_inode = file_inode(coda_file);
         struct coda_file_info *cfi;
         int err;
 
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index be2aa4909487..6df708c7b3e8 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -129,7 +129,7 @@ static int get_device_index(struct coda_mount_data *data)
         f = fdget(data->fd);
         if (!f.file)
                 goto Ebadf;
-        inode = f.file->f_path.dentry->d_inode;
+        inode = file_inode(f.file);
         if (!S_ISCHR(inode->i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {
                 fdput(f);
                 goto Ebadf;
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index ee0981f1375b..3f5de96bbb58 100644
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -52,7 +52,7 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
         struct path path;
         int error;
         struct PioctlData data;
-        struct inode *inode = filp->f_dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         struct inode *target_inode = NULL;
         struct coda_inode_info *cnp;