From b8969515199752320b579be8245a998335c5f8d6 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 11 Jun 2008 15:44:23 -0400 Subject: [PATCH] --- yaml --- r: 101972 b: refs/heads/master c: c3cc8c019ca09767d7c9b5457d5cf8ac65085f44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e33d932f227..76a13f9999be 100644 --- 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 index e5f950291928..28a238dab23a 100644 --- 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",