5 files changed, 16 insertions, 16 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index 69a40c9777a2..70d0d88e5554 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -118,7 +118,7 @@ static int check_free_space(struct file *file)
         spin_unlock(&acct_globals.lock);
 
         /* May block */
-        if (vfs_statfs(file->f_dentry, &sbuf))
+        if (vfs_statfs(file->f_path.dentry, &sbuf))
                 return res;
         suspend = sbuf.f_blocks * SUSPEND;
         resume = sbuf.f_blocks * RESUME;
@@ -194,7 +194,7 @@ static void acct_file_reopen(struct file *file)
                 add_timer(&acct_globals.timer);
         }
         if (old_acct) {
-                mnt_unpin(old_acct->f_vfsmnt);
+                mnt_unpin(old_acct->f_path.mnt);
                 spin_unlock(&acct_globals.lock);
                 do_acct_process(old_acct);
                 filp_close(old_acct, NULL);
@@ -212,7 +212,7 @@ static int acct_on(char *name)
         if (IS_ERR(file))
                 return PTR_ERR(file);
 
-        if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
+        if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) {
                 filp_close(file, NULL);
                 return -EACCES;
         }
@@ -229,11 +229,11 @@ static int acct_on(char *name)
         }
 
         spin_lock(&acct_globals.lock);
-        mnt_pin(file->f_vfsmnt);
+        mnt_pin(file->f_path.mnt);
         acct_file_reopen(file);
         spin_unlock(&acct_globals.lock);
 
-        mntput(file->f_vfsmnt); /* it's pinned, now give up active reference */
+        mntput(file->f_path.mnt); /* it's pinned, now give up active reference */
 
         return 0;
 }
@@ -283,7 +283,7 @@ asmlinkage long sys_acct(const char __user *name)
 void acct_auto_close_mnt(struct vfsmount *m)
 {
         spin_lock(&acct_globals.lock);
-        if (acct_globals.file && acct_globals.file->f_vfsmnt == m)
+        if (acct_globals.file && acct_globals.file->f_path.mnt == m)
                 acct_file_reopen(NULL);
         spin_unlock(&acct_globals.lock);
 }
@@ -299,7 +299,7 @@ void acct_auto_close(struct super_block *sb)
 {
         spin_lock(&acct_globals.lock);
         if (acct_globals.file &&
-            acct_globals.file->f_vfsmnt->mnt_sb == sb) {
+            acct_globals.file->f_path.mnt->mnt_sb == sb) {
                 acct_file_reopen(NULL);
         }
         spin_unlock(&acct_globals.lock);
diff --git a/kernel/fork.c b/kernel/fork.c
index f387a1393ca5..597707819327 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -252,7 +252,7 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                 anon_vma_link(tmp);
                 file = tmp->vm_file;
                 if (file) {
-                        struct inode *inode = file->f_dentry->d_inode;
+                        struct inode *inode = file->f_path.dentry->d_inode;
                         get_file(file);
                         if (tmp->vm_flags & VM_DENYWRITE)
                                 atomic_dec(&inode->i_writecount);
diff --git a/kernel/futex.c b/kernel/futex.c
index 95989a3b4168..5a737de857d3 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -166,7 +166,7 @@ static inline int match_futex(union futex_key *key1, union futex_key *key2)
 /*
  * Get parameters which are the keys for a futex.
  *
- * For shared mappings, it's (page->index, vma->vm_file->f_dentry->d_inode,
+ * For shared mappings, it's (page->index, vma->vm_file->f_path.dentry->d_inode,
  * offset_within_page).  For private mappings, it's (uaddr, current->mm).
  * We can usually work out the index without swapping in the page.
  *
@@ -223,7 +223,7 @@ static int get_futex_key(u32 __user *uaddr, union futex_key *key)
         /*
          * Linear file mappings are also simple.
          */
-        key->shared.inode = vma->vm_file->f_dentry->d_inode;
+        key->shared.inode = vma->vm_file->f_path.dentry->d_inode;
         key->both.offset++; /* Bit 0 of offset indicates inode-based key. */
         if (likely(!(vma->vm_flags & VM_NONLINEAR))) {
                 key->shared.pgoff = (((address - vma->vm_start) >> PAGE_SHIFT)
@@ -1528,9 +1528,9 @@ static int futex_fd(u32 __user *uaddr, int signal)
                 goto out;
         }
         filp->f_op = &futex_fops;
-        filp->f_vfsmnt = mntget(futex_mnt);
-        filp->f_dentry = dget(futex_mnt->mnt_root);
-        filp->f_mapping = filp->f_dentry->d_inode->i_mapping;
+        filp->f_path.mnt = mntget(futex_mnt);
+        filp->f_path.dentry = dget(futex_mnt->mnt_root);
+        filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping;
 
         if (signal) {
                 err = __f_setown(filp, task_pid(current), PIDTYPE_PID, 1);
diff --git a/kernel/relay.c b/kernel/relay.c
index 75a3a9a7efc2..818e514729cf 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -959,7 +959,7 @@ static inline ssize_t relay_file_read_subbufs(struct file *filp,
         if (!desc->count)
                 return 0;
 
-        mutex_lock(&filp->f_dentry->d_inode->i_mutex);
+        mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);
         do {
                 if (!relay_file_read_avail(buf, *ppos))
                         break;
@@ -979,7 +979,7 @@ static inline ssize_t relay_file_read_subbufs(struct file *filp,
                         *ppos = relay_file_read_end_pos(buf, read_start, ret);
                 }
         } while (desc->count && ret);
-        mutex_unlock(&filp->f_dentry->d_inode->i_mutex);
+        mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);
 
         return desc->written;
 }
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8e9f00fd6d18..9846db93a595 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1614,7 +1614,7 @@ static ssize_t do_rw_proc(int write, struct file * file, char __user * buf,
                           size_t count, loff_t *ppos)
 {
         int op;
-        struct proc_dir_entry *de = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *de = PDE(file->f_path.dentry->d_inode);
         struct ctl_table *table;
         size_t res;
         ssize_t error = -ENOTDIR;