diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /fs/afs/dir.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/afs/dir.c')
| -rw-r--r-- | fs/afs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index a6ec75c56fcf..4acd04134055 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c | |||
| @@ -392,10 +392,10 @@ static int afs_dir_readdir(struct file *file, void *cookie, filldir_t filldir) | |||
| 392 | unsigned fpos; | 392 | unsigned fpos; |
| 393 | int ret; | 393 | int ret; |
| 394 | 394 | ||
| 395 | _enter("{%Ld,{%lu}}", file->f_pos, file->f_dentry->d_inode->i_ino); | 395 | _enter("{%Ld,{%lu}}", file->f_pos, file->f_path.dentry->d_inode->i_ino); |
| 396 | 396 | ||
| 397 | fpos = file->f_pos; | 397 | fpos = file->f_pos; |
| 398 | ret = afs_dir_iterate(file->f_dentry->d_inode, &fpos, cookie, filldir); | 398 | ret = afs_dir_iterate(file->f_path.dentry->d_inode, &fpos, cookie, filldir); |
| 399 | file->f_pos = fpos; | 399 | file->f_pos = fpos; |
| 400 | 400 | ||
| 401 | _leave(" = %d", ret); | 401 | _leave(" = %d", ret); |