[PATCH] struct path: convert mm

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 10 insertions, 10 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index b917d6fdc1bb..da9463946556 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1857,7 +1857,7 @@ int show_numa_map(struct seq_file *m, void *v)
 
         if (file) {
                 seq_printf(m, " file=");
-                seq_path(m, file->f_vfsmnt, file->f_dentry, "\n\t= ");
+                seq_path(m, file->f_path.mnt, file->f_path.dentry, "\n\t= ");
         } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
                 seq_printf(m, " heap");
         } else if (vma->vm_start <= mm->start_stack &&
diff --git a/mm/nommu.c b/mm/nommu.c
index af874569d0f1..23fb033e596d 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -523,7 +523,7 @@ static int validate_mmap_request(struct file *file,
                  */
                 mapping = file->f_mapping;
                 if (!mapping)
-                        mapping = file->f_dentry->d_inode->i_mapping;
+                        mapping = file->f_path.dentry->d_inode->i_mapping;
 
                 capabilities = 0;
                 if (mapping && mapping->backing_dev_info)
@@ -532,7 +532,7 @@ static int validate_mmap_request(struct file *file,
                 if (!capabilities) {
                         /* no explicit capabilities set, so assume some
                          * defaults */
-                        switch (file->f_dentry->d_inode->i_mode & S_IFMT) {
+                        switch (file->f_path.dentry->d_inode->i_mode & S_IFMT) {
                         case S_IFREG:
                         case S_IFBLK:
                                 capabilities = BDI_CAP_MAP_COPY;
@@ -563,11 +563,11 @@ static int validate_mmap_request(struct file *file,
                             !(file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (IS_APPEND(file->f_dentry->d_inode) &&
+                        if (IS_APPEND(file->f_path.dentry->d_inode) &&
                             (file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (locks_verify_locked(file->f_dentry->d_inode))
+                        if (locks_verify_locked(file->f_path.dentry->d_inode))
                                 return -EAGAIN;
 
                         if (!(capabilities & BDI_CAP_MAP_DIRECT))
@@ -598,7 +598,7 @@ static int validate_mmap_request(struct file *file,
 
                 /* handle executable mappings and implied executable
                  * mappings */
-                if (file->f_vfsmnt->mnt_flags & MNT_NOEXEC) {
+                if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) {
                         if (prot & PROT_EXEC)
                                 return -EPERM;
                 }
@@ -833,7 +833,7 @@ unsigned long do_mmap_pgoff(struct file *file,
                                 continue;
 
                         /* search for overlapping mappings on the same file */
-                        if (vma->vm_file->f_dentry->d_inode != file->f_dentry->d_inode)
+                        if (vma->vm_file->f_path.dentry->d_inode != file->f_path.dentry->d_inode)
                                 continue;
 
                         if (vma->vm_pgoff >= pgoff + pglen)
diff --git a/mm/readahead.c b/mm/readahead.c
index a386f2b6b335..c0df5ed05f62 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -450,7 +450,7 @@ static int make_ahead_window(struct address_space *mapping, struct file *filp,
  *
  * Note that @filp is purely used for passing on to the ->readpage[s]()
  * handler: it may refer to a different file from @mapping (so we may not use
- * @filp->f_mapping or @filp->f_dentry->d_inode here).
+ * @filp->f_mapping or @filp->f_path.dentry->d_inode here).
  * Also, @ra may not be equal to &@filp->f_ra.
  *
  */
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index 5f2cbf0f153c..c7f6e1914bc4 100644
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -79,8 +79,8 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
         d_instantiate(dentry, inode);
         inode->i_nlink = 0;     /* It is unlinked */
 
-        file->f_vfsmnt = mntget(shm_mnt);
-        file->f_dentry = dentry;
+        file->f_path.mnt = mntget(shm_mnt);
+        file->f_path.dentry = dentry;
         file->f_mapping = inode->i_mapping;
         file->f_op = &ramfs_file_operations;
         file->f_mode = FMODE_WRITE | FMODE_READ;