diff options
-rw-r--r-- | fs/nfs/dir.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 68e0688904ea..1bdc36bf1782 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -884,10 +884,8 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode) | |||
884 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; | 884 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; |
885 | 885 | ||
886 | if (dentry->d_flags & DCACHE_NFSFS_RENAMED) { | 886 | if (dentry->d_flags & DCACHE_NFSFS_RENAMED) { |
887 | lock_kernel(); | ||
888 | drop_nlink(inode); | 887 | drop_nlink(inode); |
889 | nfs_complete_unlink(dentry, inode); | 888 | nfs_complete_unlink(dentry, inode); |
890 | unlock_kernel(); | ||
891 | } | 889 | } |
892 | iput(inode); | 890 | iput(inode); |
893 | } | 891 | } |
@@ -1434,9 +1432,7 @@ static int nfs_unlink(struct inode *dir, struct dentry *dentry) | |||
1434 | spin_unlock(&dcache_lock); | 1432 | spin_unlock(&dcache_lock); |
1435 | /* Start asynchronous writeout of the inode */ | 1433 | /* Start asynchronous writeout of the inode */ |
1436 | write_inode_now(dentry->d_inode, 0); | 1434 | write_inode_now(dentry->d_inode, 0); |
1437 | lock_kernel(); | ||
1438 | error = nfs_sillyrename(dir, dentry); | 1435 | error = nfs_sillyrename(dir, dentry); |
1439 | unlock_kernel(); | ||
1440 | return error; | 1436 | return error; |
1441 | } | 1437 | } |
1442 | if (!d_unhashed(dentry)) { | 1438 | if (!d_unhashed(dentry)) { |
@@ -1617,9 +1613,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1617 | goto out; | 1613 | goto out; |
1618 | 1614 | ||
1619 | /* silly-rename the existing target ... */ | 1615 | /* silly-rename the existing target ... */ |
1620 | lock_kernel(); | ||
1621 | err = nfs_sillyrename(new_dir, new_dentry); | 1616 | err = nfs_sillyrename(new_dir, new_dentry); |
1622 | unlock_kernel(); | ||
1623 | if (!err) { | 1617 | if (!err) { |
1624 | new_dentry = rehash = dentry; | 1618 | new_dentry = rehash = dentry; |
1625 | new_inode = NULL; | 1619 | new_inode = NULL; |