new helper: file_inode(file)

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

7 files changed, 21 insertions, 21 deletions

diff --git a/mm/fadvise.c b/mm/fadvise.c
index a47f0f50c89f..6deaa6c04636 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -38,7 +38,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
         if (!f.file)
                 return -EBADF;
 
-        if (S_ISFIFO(f.file->f_path.dentry->d_inode->i_mode)) {
+        if (S_ISFIFO(file_inode(f.file)->i_mode)) {
                 ret = -ESPIPE;
                 goto out;
         }
diff --git a/mm/filemap.c b/mm/filemap.c
index 83efee76a5c0..6a48a7ea8f4f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1711,7 +1711,7 @@ EXPORT_SYMBOL(filemap_fault);
 int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct page *page = vmf->page;
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         int ret = VM_FAULT_LOCKED;
 
         sb_start_pagefault(inode->i_sb);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 4f3ea0b1e57c..b97e806e5d9a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -127,7 +127,7 @@ static inline struct hugepage_subpool *subpool_inode(struct inode *inode)
 
 static inline struct hugepage_subpool *subpool_vma(struct vm_area_struct *vma)
 {
-        return subpool_inode(vma->vm_file->f_dentry->d_inode);
+        return subpool_inode(file_inode(vma->vm_file));
 }
 
 /*
@@ -2482,7 +2482,7 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
         address = address & huge_page_mask(h);
         pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) +
                         vma->vm_pgoff;
-        mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
+        mapping = file_inode(vma->vm_file)->i_mapping;
 
         /*
          * Take the mapping lock for the duration of the table walk. As
diff --git a/mm/mmap.c b/mm/mmap.c
index 35730ee9d515..22dfc01e9681 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -202,7 +202,7 @@ static void __remove_shared_vm_struct(struct vm_area_struct *vma,
                 struct file *file, struct address_space *mapping)
 {
         if (vma->vm_flags & VM_DENYWRITE)
-                atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
+                atomic_inc(&file_inode(file)->i_writecount);
         if (vma->vm_flags & VM_SHARED)
                 mapping->i_mmap_writable--;
 
@@ -567,7 +567,7 @@ static void __vma_link_file(struct vm_area_struct *vma)
                 struct address_space *mapping = file->f_mapping;
 
                 if (vma->vm_flags & VM_DENYWRITE)
-                        atomic_dec(&file->f_path.dentry->d_inode->i_writecount);
+                        atomic_dec(&file_inode(file)->i_writecount);
                 if (vma->vm_flags & VM_SHARED)
                         mapping->i_mmap_writable++;
 
@@ -1217,7 +1217,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
                         return -EAGAIN;
         }
 
-        inode = file ? file->f_path.dentry->d_inode : NULL;
+        inode = file ? file_inode(file) : NULL;
 
         if (file) {
                 switch (flags & MAP_TYPE) {
@@ -1403,7 +1403,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
         int error;
         struct rb_node **rb_link, *rb_parent;
         unsigned long charged = 0;
-        struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
+        struct inode *inode =  file ? file_inode(file) : NULL;
 
         /* Clear old maps */
         error = -ENOMEM;
diff --git a/mm/nommu.c b/mm/nommu.c
index 79c3cac87afa..f87d2173d0d0 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -941,7 +941,7 @@ static int validate_mmap_request(struct file *file,
                  */
                 mapping = file->f_mapping;
                 if (!mapping)
-                        mapping = file->f_path.dentry->d_inode->i_mapping;
+                        mapping = file_inode(file)->i_mapping;
 
                 capabilities = 0;
                 if (mapping && mapping->backing_dev_info)
@@ -950,7 +950,7 @@ static int validate_mmap_request(struct file *file,
                 if (!capabilities) {
                         /* no explicit capabilities set, so assume some
                          * defaults */
-                        switch (file->f_path.dentry->d_inode->i_mode & S_IFMT) {
+                        switch (file_inode(file)->i_mode & S_IFMT) {
                         case S_IFREG:
                         case S_IFBLK:
                                 capabilities = BDI_CAP_MAP_COPY;
@@ -985,11 +985,11 @@ static int validate_mmap_request(struct file *file,
                             !(file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (IS_APPEND(file->f_path.dentry->d_inode) &&
+                        if (IS_APPEND(file_inode(file)) &&
                             (file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (locks_verify_locked(file->f_path.dentry->d_inode))
+                        if (locks_verify_locked(file_inode(file)))
                                 return -EAGAIN;
 
                         if (!(capabilities & BDI_CAP_MAP_DIRECT))
@@ -1322,8 +1322,8 @@ unsigned long do_mmap_pgoff(struct file *file,
                                 continue;
 
                         /* search for overlapping mappings on the same file */
-                        if (pregion->vm_file->f_path.dentry->d_inode !=
-                            file->f_path.dentry->d_inode)
+                        if (file_inode(pregion->vm_file) !=
+                            file_inode(file))
                                 continue;
 
                         if (pregion->vm_pgoff >= pgend)
diff --git a/mm/shmem.c b/mm/shmem.c
index 5dd56f6efdbd..814d5546cb35 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1295,7 +1295,7 @@ unlock:
 
 static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         int error;
         int ret = VM_FAULT_LOCKED;
 
@@ -1313,14 +1313,14 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 #ifdef CONFIG_NUMA
 static int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *mpol)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         return mpol_set_shared_policy(&SHMEM_I(inode)->policy, vma, mpol);
 }
 
 static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
                                           unsigned long addr)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         pgoff_t index;
 
         index = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
@@ -1330,7 +1330,7 @@ static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
 
 int shmem_lock(struct file *file, int lock, struct user_struct *user)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct shmem_inode_info *info = SHMEM_I(inode);
         int retval = -ENOMEM;
 
@@ -1465,7 +1465,7 @@ shmem_write_end(struct file *file, struct address_space *mapping,
 
 static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
 {
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         struct address_space *mapping = inode->i_mapping;
         pgoff_t index;
         unsigned long offset;
@@ -1808,7 +1808,7 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)
 static long shmem_fallocate(struct file *file, int mode, loff_t offset,
                                                          loff_t len)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
         struct shmem_falloc shmem_falloc;
         pgoff_t start, index, end;
diff --git a/mm/swapfile.c b/mm/swapfile.c
index e97a0e5aea91..ed393002fc09 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1699,7 +1699,7 @@ static int swap_show(struct seq_file *swap, void *v)
         len = seq_path(swap, &file->f_path, " \t\n\\");
         seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
                         len < 40 ? 40 - len : 1, " ",
-                        S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
+                        S_ISBLK(file_inode(file)->i_mode) ?
                                 "partition" : "file\t",
                         si->pages << (PAGE_SHIFT - 10),
                         si->inuse_pages << (PAGE_SHIFT - 10),