From 96249c56df07b228b63cde6285cae0f73bbfa8db Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 11 Jun 2008 13:26:23 -0400
Subject: [PATCH] --- yaml --- r: 101965 b: refs/heads/master c:
 bba67e0e3f4caba2b2b90b48ed798fb0461bcb86 h: refs/heads/master i:   101963:
 a3861a94ffa5b180da8aa01e4ff4b706b6ab1bd8 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/dir.c      | 6 ------
 trunk/fs/nfs/file.c     | 2 --
 trunk/fs/nfs/nfs4proc.c | 2 --
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 81931e0cd22f..dafb2ea6dda3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6a2e569e2157509951c9f3f58dfa18b44ce91b3
+refs/heads/master: bba67e0e3f4caba2b2b90b48ed798fb0461bcb86
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 73e0f9740dd1..c68ec447ace1 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -139,10 +139,8 @@ nfs_opendir(struct inode *inode, struct file *filp)
 
 	nfs_inc_stats(inode, NFSIOS_VFSOPEN);
 
-	lock_kernel();
 	/* Call generic open code in order to cache credentials */
 	res = nfs_open(inode, filp);
-	unlock_kernel();
 	return res;
 }
 
@@ -1019,9 +1017,7 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
 	}
 
 	/* Open the file on the server */
-	lock_kernel();
 	res = nfs4_atomic_open(dir, dentry, nd);
-	unlock_kernel();
 	if (IS_ERR(res)) {
 		error = PTR_ERR(res);
 		switch (error) {
@@ -1083,9 +1079,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
 	 * operations that change the directory. We therefore save the
 	 * change attribute *before* we do the RPC call.
 	 */
-	lock_kernel();
 	ret = nfs4_open_revalidate(dir, dentry, openflags, nd);
-	unlock_kernel();
 out:
 	dput(parent);
 	if (!ret)
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index f919d9a01a27..9f1bed944b2e 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -128,9 +128,7 @@ nfs_file_open(struct inode *inode, struct file *filp)
 		return res;
 
 	nfs_inc_stats(inode, NFSIOS_VFSOPEN);
-	lock_kernel();
 	res = nfs_open(inode, filp);
-	unlock_kernel();
 	return res;
 }
 
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 4451287a81d1..c910413eaeca 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -451,9 +451,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata)
 		/* Save the delegation */
 		memcpy(stateid.data, delegation->stateid.data, sizeof(stateid.data));
 		rcu_read_unlock();
-		lock_kernel();
 		ret = nfs_may_open(state->inode, state->owner->so_cred, open_mode);
-		unlock_kernel();
 		if (ret != 0)
 			goto out;
 		ret = -EAGAIN;