aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-06-11 15:44:23 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-15 18:10:56 -0400
commitc3cc8c019ca09767d7c9b5457d5cf8ac65085f44 (patch)
treef06f3ec2e30994018b31da44ee81b8306b00af75 /fs/nfs/dir.c
parent76566991f94c206d9c5881edcaf99ba72c9e9d61 (diff)
NFS: Remove BKL from the readdir code
Page accesses are serialised using the page locks, whereas all attribute updates are serialised using the inode->i_lock. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index e5f950291928..28a238dab23a 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -534,8 +534,6 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
534 (long long)filp->f_pos); 534 (long long)filp->f_pos);
535 nfs_inc_stats(inode, NFSIOS_VFSGETDENTS); 535 nfs_inc_stats(inode, NFSIOS_VFSGETDENTS);
536 536
537 lock_kernel();
538
539 /* 537 /*
540 * filp->f_pos points to the dirent entry number. 538 * filp->f_pos points to the dirent entry number.
541 * *desc->dir_cookie has the cookie for the next entry. We have 539 * *desc->dir_cookie has the cookie for the next entry. We have
@@ -593,7 +591,6 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
593 } 591 }
594out: 592out:
595 nfs_unblock_sillyrename(dentry); 593 nfs_unblock_sillyrename(dentry);
596 unlock_kernel();
597 if (res > 0) 594 if (res > 0)
598 res = 0; 595 res = 0;
599 dfprintk(FILE, "NFS: readdir(%s/%s) returns %ld\n", 596 dfprintk(FILE, "NFS: readdir(%s/%s) returns %ld\n",