patch-2.4.0-test8 linux/fs/nfs/dir.c

• Lines: 27
• Date: Tue Sep 5 14:02:41 2000
• Orig file: v2.4.0-test7/linux/fs/nfs/dir.c
• Orig date: Wed Aug 23 18:36:38 2000

diff -u --recursive --new-file v2.4.0-test7/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -606,16 +606,8 @@
 static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode)
 {
 	if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {
-		struct dentry *dir = dentry->d_parent;
-		struct inode *dir_i = dir->d_inode;
-		int error;
-		
 		lock_kernel();
-		dir = dentry->d_parent;
-		dir_i = dir->d_inode;
-		nfs_zap_caches(dir_i);
-		NFS_CACHEINV(inode);
-		error = NFS_PROTO(dir_i)->remove(dir, &dentry->d_name);
+		nfs_complete_unlink(dentry);
 		unlock_kernel();
 	}
 	iput(inode);
@@ -868,7 +860,7 @@
 	if (!error) {
 		nfs_renew_times(dentry);
 		d_move(dentry, sdentry);
-		dentry->d_flags |= DCACHE_NFSFS_RENAMED;
+		error = nfs_async_unlink(dentry);
  		/* If we return 0 we don't unlink */
 	}
 	dput(sdentry);