diff options
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 0fa1dbcdadb9..ea97408e423e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -869,7 +869,7 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode) | |||
869 | if (dentry->d_flags & DCACHE_NFSFS_RENAMED) { | 869 | if (dentry->d_flags & DCACHE_NFSFS_RENAMED) { |
870 | lock_kernel(); | 870 | lock_kernel(); |
871 | drop_nlink(inode); | 871 | drop_nlink(inode); |
872 | nfs_complete_unlink(dentry); | 872 | nfs_complete_unlink(dentry, inode); |
873 | unlock_kernel(); | 873 | unlock_kernel(); |
874 | } | 874 | } |
875 | /* When creating a negative dentry, we want to renew d_time */ | 875 | /* When creating a negative dentry, we want to renew d_time */ |
@@ -1411,7 +1411,7 @@ static int nfs_sillyrename(struct inode *dir, struct dentry *dentry) | |||
1411 | nfs_renew_times(dentry); | 1411 | nfs_renew_times(dentry); |
1412 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | 1412 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); |
1413 | d_move(dentry, sdentry); | 1413 | d_move(dentry, sdentry); |
1414 | error = nfs_async_unlink(dentry); | 1414 | error = nfs_async_unlink(dir, dentry); |
1415 | /* If we return 0 we don't unlink */ | 1415 | /* If we return 0 we don't unlink */ |
1416 | } | 1416 | } |
1417 | dput(sdentry); | 1417 | dput(sdentry); |