From 6e75f09dc75aedb2211ff5aebc09ce1c60340924 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 11 Jun 2008 15:52:40 -0400
Subject: [PATCH] --- yaml --- r: 101967 b: refs/heads/master c:
 fc81af535e462764e17f638d542973fbef13b026 h: refs/heads/master i:   101965:
 96249c56df07b228b63cde6285cae0f73bbfa8db   101963:
 a3861a94ffa5b180da8aa01e4ff4b706b6ab1bd8   101959:
 186e0b15309b43efded83efe5767a413783b5037   101951:
 f01787150e7fd0ac445dbb559fd61da21f0b3431 v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 777ffc64fd49..330f7cae4b0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1e2eda23513b68003202bddf1f84158baad8844
+refs/heads/master: fc81af535e462764e17f638d542973fbef13b026
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index d40e91e5c94a..5ae8ee6b298f 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1549,14 +1549,12 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
 		dentry->d_parent->d_name.name, dentry->d_name.name);
 
-	lock_kernel();
 	d_drop(dentry);
 	error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
 	if (error == 0) {
 		atomic_inc(&inode->i_count);
 		d_add(dentry, inode);
 	}
-	unlock_kernel();
 	return error;
 }