[PATCH] mm: change uses of f_{dentry,vfsmnt} to use f_path

Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in linux/mm/.

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

diff --git a/mm/fadvise.c b/mm/fadvise.c
index 168c78a121bb0f67835dabcae5e3f4edb74e8e7d..0df4c899e979ec1101cb629a660fc04b31e1095e 100644 (file)
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -38,7 +38,7 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
        if (!file)
                return -EBADF;
 
-       if (S_ISFIFO(file->f_dentry->d_inode->i_mode)) {
+       if (S_ISFIFO(file->f_path.dentry->d_inode->i_mode)) {
                ret = -ESPIPE;
                goto out;
        }

diff --git a/mm/filemap.c b/mm/filemap.c
index af7e2f5caea94c12a21847fe7fe23047b58c344e..606432f71b3a17dafd791b46361c29a996beec18 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2269,7 +2269,7 @@ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
        if (count == 0)
                goto out;
 
-       err = remove_suid(file->f_dentry);
+       err = remove_suid(file->f_path.dentry);
        if (err)
                goto out;
 

diff --cc mm/filemap_xip.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/swapfile.c
Simple merge