Re: [PATCH NFSv2] Drop inode after rename

[Olaf Kirch <okir@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Sorry, I sent an older version of this patch. Here's the one for
2.6.12.

Olaf
-- 
Olaf Kirch   |  --- o --- Nous sommes du soleil we love when we play
okir@suse.de |    / | \   sol.dhoop.naytheet.ah kin.ir.samse.qurax

[-- Attachment #2: nfs-rename-zap-inode --]
[-- Type: text/plain, Size: 1103 bytes --]

Index: test12/fs/nfs/dir.c
===================================================================
--- test12.orig/fs/nfs/dir.c	2005-07-08 11:45:18.000000000 +0200
+++ test12/fs/nfs/dir.c	2005-07-11 12:49:34.000000000 +0200
@@ -1445,8 +1445,15 @@ go_ahead:
 		shrink_dcache_parent(old_dentry);
 	}
 
-	if (new_inode)
+	/* d_delete will currently not do a dentry_iput
+	 * because new_dentry->d_count is at least 2 when
+	 * we get here. As a matter of caution
+	 * let's grab a reference to the inode anyway.
+	 */
+	if (new_inode && igrab(new_inode)) {
+		nfs_begin_data_update(new_inode);
 		d_delete(new_dentry);
+	}
 
 	nfs_begin_data_update(old_dir);
 	nfs_begin_data_update(new_dir);
@@ -1456,6 +1463,17 @@ go_ahead:
 	nfs_end_data_update(old_inode);
 	nfs_end_data_update(new_dir);
 	nfs_end_data_update(old_dir);
+
+	if (new_inode) {
+		/* If this was the last reference to the inode make
+		 * sure the VFS zaps it and all associated caches.
+		 */
+		if (error == 0)
+			new_inode->i_nlink--;
+		nfs_end_data_update(new_inode);  
+		iput(new_inode);
+	}
+
 out:
 	if (rehash)
 		d_rehash(rehash);