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; }