diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:49 -0500 |
commit | 17b75e69493f655a09908045eddbb48718aef5de (patch) | |
tree | e38bd5c7dfea2027f81ea7a784ee2003bcb9c47c /fs/smbfs/file.c | |
parent | c943c4b49c75f3cae89e5d993ce1ae859395caa2 (diff) |
[PATCH] struct path: convert smbfs
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>
Diffstat (limited to 'fs/smbfs/file.c')
-rw-r--r-- | fs/smbfs/file.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c index 50784d13c87b..e50533a79517 100644 --- a/fs/smbfs/file.c +++ b/fs/smbfs/file.c | |||
@@ -102,7 +102,7 @@ static int | |||
102 | smb_readpage(struct file *file, struct page *page) | 102 | smb_readpage(struct file *file, struct page *page) |
103 | { | 103 | { |
104 | int error; | 104 | int error; |
105 | struct dentry *dentry = file->f_dentry; | 105 | struct dentry *dentry = file->f_path.dentry; |
106 | 106 | ||
107 | page_cache_get(page); | 107 | page_cache_get(page); |
108 | error = smb_readpage_sync(dentry, page); | 108 | error = smb_readpage_sync(dentry, page); |
@@ -205,7 +205,7 @@ static int | |||
205 | smb_updatepage(struct file *file, struct page *page, unsigned long offset, | 205 | smb_updatepage(struct file *file, struct page *page, unsigned long offset, |
206 | unsigned int count) | 206 | unsigned int count) |
207 | { | 207 | { |
208 | struct dentry *dentry = file->f_dentry; | 208 | struct dentry *dentry = file->f_path.dentry; |
209 | 209 | ||
210 | DEBUG1("(%s/%s %d@%lld)\n", DENTRY_PATH(dentry), count, | 210 | DEBUG1("(%s/%s %d@%lld)\n", DENTRY_PATH(dentry), count, |
211 | ((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset); | 211 | ((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset); |
@@ -218,7 +218,7 @@ smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
218 | unsigned long nr_segs, loff_t pos) | 218 | unsigned long nr_segs, loff_t pos) |
219 | { | 219 | { |
220 | struct file * file = iocb->ki_filp; | 220 | struct file * file = iocb->ki_filp; |
221 | struct dentry * dentry = file->f_dentry; | 221 | struct dentry * dentry = file->f_path.dentry; |
222 | ssize_t status; | 222 | ssize_t status; |
223 | 223 | ||
224 | VERBOSE("file %s/%s, count=%lu@%lu\n", DENTRY_PATH(dentry), | 224 | VERBOSE("file %s/%s, count=%lu@%lu\n", DENTRY_PATH(dentry), |
@@ -243,7 +243,7 @@ out: | |||
243 | static int | 243 | static int |
244 | smb_file_mmap(struct file * file, struct vm_area_struct * vma) | 244 | smb_file_mmap(struct file * file, struct vm_area_struct * vma) |
245 | { | 245 | { |
246 | struct dentry * dentry = file->f_dentry; | 246 | struct dentry * dentry = file->f_path.dentry; |
247 | int status; | 247 | int status; |
248 | 248 | ||
249 | VERBOSE("file %s/%s, address %lu - %lu\n", | 249 | VERBOSE("file %s/%s, address %lu - %lu\n", |
@@ -264,7 +264,7 @@ static ssize_t | |||
264 | smb_file_sendfile(struct file *file, loff_t *ppos, | 264 | smb_file_sendfile(struct file *file, loff_t *ppos, |
265 | size_t count, read_actor_t actor, void *target) | 265 | size_t count, read_actor_t actor, void *target) |
266 | { | 266 | { |
267 | struct dentry *dentry = file->f_dentry; | 267 | struct dentry *dentry = file->f_path.dentry; |
268 | ssize_t status; | 268 | ssize_t status; |
269 | 269 | ||
270 | VERBOSE("file %s/%s, pos=%Ld, count=%d\n", | 270 | VERBOSE("file %s/%s, pos=%Ld, count=%d\n", |
@@ -323,7 +323,7 @@ smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
323 | unsigned long nr_segs, loff_t pos) | 323 | unsigned long nr_segs, loff_t pos) |
324 | { | 324 | { |
325 | struct file * file = iocb->ki_filp; | 325 | struct file * file = iocb->ki_filp; |
326 | struct dentry * dentry = file->f_dentry; | 326 | struct dentry * dentry = file->f_path.dentry; |
327 | ssize_t result; | 327 | ssize_t result; |
328 | 328 | ||
329 | VERBOSE("file %s/%s, count=%lu@%lu\n", | 329 | VERBOSE("file %s/%s, count=%lu@%lu\n", |
@@ -355,7 +355,7 @@ static int | |||
355 | smb_file_open(struct inode *inode, struct file * file) | 355 | smb_file_open(struct inode *inode, struct file * file) |
356 | { | 356 | { |
357 | int result; | 357 | int result; |
358 | struct dentry *dentry = file->f_dentry; | 358 | struct dentry *dentry = file->f_path.dentry; |
359 | int smb_mode = (file->f_mode & O_ACCMODE) - 1; | 359 | int smb_mode = (file->f_mode & O_ACCMODE) - 1; |
360 | 360 | ||
361 | lock_kernel(); | 361 | lock_kernel(); |