From 124c143bcd1ec1bd813bb4b6443637c7ea0b82e5 Mon Sep 17 00:00:00 2001 From: Frank Filz Date: Tue, 17 Oct 2006 10:24:38 -0700 Subject: [PATCH] --- yaml --- r: 42504 b: refs/heads/master c: cae823c4c089d2c7c2a90f39f20376ccd85f9893 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs3proc.c | 3 --- trunk/fs/nfs/nfs4proc.c | 2 -- trunk/fs/nfs/proc.c | 3 --- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8cac919ebede..6658c7a3adbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a99b71c9c43499bf2312c64f5c1d367aaf559dc4 +refs/heads/master: cae823c4c089d2c7c2a90f39f20376ccd85f9893 diff --git a/trunk/fs/nfs/nfs3proc.c b/trunk/fs/nfs/nfs3proc.c index 9d7ff4f83faf..7fba06306b82 100644 --- a/trunk/fs/nfs/nfs3proc.c +++ b/trunk/fs/nfs/nfs3proc.c @@ -690,8 +690,6 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, }; int status; - lock_kernel(); - if (plus) msg.rpc_proc = &nfs3_procedures[NFS3PROC_READDIRPLUS]; @@ -702,7 +700,6 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); nfs_refresh_inode(dir, &dir_attr); dprintk("NFS reply readdir: %d\n", status); - unlock_kernel(); return status; } diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 93ac05889cbc..4b5fc714d786 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -2223,13 +2223,11 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, dentry->d_parent->d_name.name, dentry->d_name.name, (unsigned long long)cookie); - lock_kernel(); nfs4_setup_readdir(cookie, NFS_COOKIEVERF(dir), dentry, &args); res.pgbase = args.pgbase; status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); if (status == 0) memcpy(NFS_COOKIEVERF(dir), res.verifier.data, NFS4_VERIFIER_SIZE); - unlock_kernel(); dprintk("%s: returns %d\n", __FUNCTION__, status); return status; } diff --git a/trunk/fs/nfs/proc.c b/trunk/fs/nfs/proc.c index 4529cc4f3f8f..7a9013dd5d0a 100644 --- a/trunk/fs/nfs/proc.c +++ b/trunk/fs/nfs/proc.c @@ -545,13 +545,10 @@ nfs_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, }; int status; - lock_kernel(); - dprintk("NFS call readdir %d\n", (unsigned int)cookie); status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0); dprintk("NFS reply readdir: %d\n", status); - unlock_kernel(); return status; }