---

yaml --- r: 16626 b: refs/heads/master c: 2417411 h: refs/heads/master v: v3
git-mirror · Jan 6, 2006 · be1176c · be1176c
1 parent 8f95278
commit be1176c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40859d7ee64ed6bfad8a4e93f9bb5c1074afadff
+refs/heads/master: 24174119c73983d5217da8f56a12c79a9b57e056
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -1550,8 +1550,10 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	}
 	nfs_inode_return_delegation(old_inode);
 
-	if (new_inode)
+	if (new_inode != NULL) {
+		nfs_inode_return_delegation(new_inode);
 		d_delete(new_dentry);
+	}
 
 	nfs_begin_data_update(old_dir);
 	nfs_begin_data_update(new_dir);