diff options
-rw-r--r-- | fs/9p/vfs_addr.c | 2 | ||||
-rw-r--r-- | fs/9p/vfs_dir.c | 4 | ||||
-rw-r--r-- | fs/9p/vfs_file.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 9dfd259a70b4..cc24abf232d5 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c | |||
@@ -54,7 +54,7 @@ static int v9fs_vfs_readpage(struct file *filp, struct page *page) | |||
54 | int retval = -EIO; | 54 | int retval = -EIO; |
55 | loff_t offset = page_offset(page); | 55 | loff_t offset = page_offset(page); |
56 | int count = PAGE_CACHE_SIZE; | 56 | int count = PAGE_CACHE_SIZE; |
57 | struct inode *inode = filp->f_dentry->d_inode; | 57 | struct inode *inode = filp->f_path.dentry->d_inode; |
58 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); | 58 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); |
59 | int rsize = v9ses->maxdata - V9FS_IOHDRSZ; | 59 | int rsize = v9ses->maxdata - V9FS_IOHDRSZ; |
60 | struct v9fs_fid *v9f = filp->private_data; | 60 | struct v9fs_fid *v9f = filp->private_data; |
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 905c882f4e2f..3129688143ea 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
@@ -71,7 +71,7 @@ static inline int dt_type(struct v9fs_stat *mistat) | |||
71 | static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) | 71 | static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) |
72 | { | 72 | { |
73 | struct v9fs_fcall *fcall = NULL; | 73 | struct v9fs_fcall *fcall = NULL; |
74 | struct inode *inode = filp->f_dentry->d_inode; | 74 | struct inode *inode = filp->f_path.dentry->d_inode; |
75 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); | 75 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); |
76 | struct v9fs_fid *file = filp->private_data; | 76 | struct v9fs_fid *file = filp->private_data; |
77 | unsigned int i, n, s; | 77 | unsigned int i, n, s; |
@@ -80,7 +80,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
80 | struct v9fs_stat stat; | 80 | struct v9fs_stat stat; |
81 | int over = 0; | 81 | int over = 0; |
82 | 82 | ||
83 | dprintk(DEBUG_VFS, "name %s\n", filp->f_dentry->d_name.name); | 83 | dprintk(DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name); |
84 | 84 | ||
85 | fid = file->fid; | 85 | fid = file->fid; |
86 | 86 | ||
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; |