---

yaml --- r: 101972 b: refs/heads/master c: c3cc8c0 h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · b896951 · b896951
1 parent 3dc6d4b
commit b896951
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76566991f94c206d9c5881edcaf99ba72c9e9d61
+refs/heads/master: c3cc8c019ca09767d7c9b5457d5cf8ac65085f44
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -534,8 +534,6 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 			(long long)filp->f_pos);
 	nfs_inc_stats(inode, NFSIOS_VFSGETDENTS);
 
-	lock_kernel();
-
 	/*
 	 * filp->f_pos points to the dirent entry number.
 	 * *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)
 	}
 out:
 	nfs_unblock_sillyrename(dentry);
-	unlock_kernel();
 	if (res > 0)
 		res = 0;
 	dfprintk(FILE, "NFS: readdir(%s/%s) returns %ld\n",