diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /fs/nfs/dir.c | |
| parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index dee3d6c0f194..d9ba8cb0ee75 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -532,7 +532,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 532 | 532 | ||
| 533 | lock_kernel(); | 533 | lock_kernel(); |
| 534 | 534 | ||
| 535 | res = nfs_revalidate_mapping(inode, filp->f_mapping); | 535 | res = nfs_revalidate_mapping_nolock(inode, filp->f_mapping); |
| 536 | if (res < 0) { | 536 | if (res < 0) { |
| 537 | unlock_kernel(); | 537 | unlock_kernel(); |
| 538 | return res; | 538 | return res; |