NFS: Remove the BKL from nfs_link()

Trond Myklebust · Trond Myklebust · commit fc81af535e46 · 2008-07-15T18:10:54.000-04:00
Signed-off-by: Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;
diff --git a/fs/nfs/dir.c b/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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1549,14 +1549,12 @@ nfs_link(struct dentry old_dentry, struct inode dir, struct dentry *dentry)`
`1549`	`1549`	`old_dentry->d_parent->d_name.name, old_dentry->d_name.name,`
`1550`	`1550`	`dentry->d_parent->d_name.name, dentry->d_name.name);`
`1551`	`1551`
`1552`		`- lock_kernel();`
`1553`	`1552`	`d_drop(dentry);`
`1554`	`1553`	`error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);`
`1555`	`1554`	`if (error == 0) {`
`1556`	`1555`	`atomic_inc(&inode->i_count);`
`1557`	`1556`	`d_add(dentry, inode);`
`1558`	`1557`	`}`
`1559`		`- unlock_kernel();`
`1560`	`1558`	`return error;`
`1561`	`1559`	`}`
`1562`	`1560`