diff options
author | Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> | 2006-12-08 05:36:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:43 -0500 |
commit | d6f787bceeab37cd6b0823872efe01b2a20effb5 (patch) | |
tree | 6d4ee2f46b689b6b2ed7838378f3c6edaa61471f /fs/9p/vfs_file.c | |
parent | d3ac7f892b7d07d61d0895caa4f6e190e43112f8 (diff) |
[PATCH] 9p: change uses of f_{dentry,vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the 9p
filesystem.
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>
Diffstat (limited to 'fs/9p/vfs_file.c')
-rw-r--r-- | fs/9p/vfs_file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 79e6f9cd7340..e86a07151280 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
@@ -60,7 +60,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) | |||
60 | 60 | ||
61 | dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); | 61 | dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); |
62 | 62 | ||
63 | vfid = v9fs_fid_lookup(file->f_dentry); | 63 | vfid = v9fs_fid_lookup(file->f_path.dentry); |
64 | if (!vfid) { | 64 | if (!vfid) { |
65 | dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n"); | 65 | dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n"); |
66 | return -EBADF; | 66 | return -EBADF; |
@@ -133,7 +133,7 @@ free_fcall: | |||
133 | static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) | 133 | static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) |
134 | { | 134 | { |
135 | int res = 0; | 135 | int res = 0; |
136 | struct inode *inode = filp->f_dentry->d_inode; | 136 | struct inode *inode = filp->f_path.dentry->d_inode; |
137 | 137 | ||
138 | dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); | 138 | dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); |
139 | 139 | ||
@@ -161,7 +161,7 @@ static ssize_t | |||
161 | v9fs_file_read(struct file *filp, char __user * data, size_t count, | 161 | v9fs_file_read(struct file *filp, char __user * data, size_t count, |
162 | loff_t * offset) | 162 | loff_t * offset) |
163 | { | 163 | { |
164 | struct inode *inode = filp->f_dentry->d_inode; | 164 | struct inode *inode = filp->f_path.dentry->d_inode; |
165 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); | 165 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); |
166 | struct v9fs_fid *v9f = filp->private_data; | 166 | struct v9fs_fid *v9f = filp->private_data; |
167 | struct v9fs_fcall *fcall = NULL; | 167 | struct v9fs_fcall *fcall = NULL; |
@@ -225,7 +225,7 @@ static ssize_t | |||
225 | v9fs_file_write(struct file *filp, const char __user * data, | 225 | v9fs_file_write(struct file *filp, const char __user * data, |
226 | size_t count, loff_t * offset) | 226 | size_t count, loff_t * offset) |
227 | { | 227 | { |
228 | struct inode *inode = filp->f_dentry->d_inode; | 228 | struct inode *inode = filp->f_path.dentry->d_inode; |
229 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); | 229 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); |
230 | struct v9fs_fid *v9fid = filp->private_data; | 230 | struct v9fs_fid *v9fid = filp->private_data; |
231 | struct v9fs_fcall *fcall; | 231 | struct v9fs_fcall *fcall; |