[PATCH] VFS: change struct file to use struct path

This patch changes struct file to use struct path instead of having
independent pointers to struct dentry and struct vfsmount, and converts all
users of f_{dentry,vfsmnt} in fs/ to use f_path.{dentry,mnt}.

Additionally, it adds two #define's to make the transition easier for users of
the f_dentry and f_vfsmnt.

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>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index 0901bdc2ce24..38646132ab0e 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -268,7 +268,7 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,
         f = fget(fd);
         if (!f)
                 return error;
-        dentry = f->f_dentry;
+        dentry = f->f_path.dentry;
         audit_inode(NULL, dentry->d_inode);
         error = setxattr(dentry, name, value, size, flags);
         fput(f);
@@ -351,7 +351,7 @@ sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size)
         f = fget(fd);
         if (!f)
                 return error;
-        error = getxattr(f->f_dentry, name, value, size);
+        error = getxattr(f->f_path.dentry, name, value, size);
         fput(f);
         return error;
 }
@@ -423,7 +423,7 @@ sys_flistxattr(int fd, char __user *list, size_t size)
         f = fget(fd);
         if (!f)
                 return error;
-        error = listxattr(f->f_dentry, list, size);
+        error = listxattr(f->f_path.dentry, list, size);
         fput(f);
         return error;
 }
@@ -484,7 +484,7 @@ sys_fremovexattr(int fd, char __user *name)
         f = fget(fd);
         if (!f)
                 return error;
-        dentry = f->f_dentry;
+        dentry = f->f_path.dentry;
         audit_inode(NULL, dentry->d_inode);
         error = removexattr(dentry, name);
         fput(f);