Browse Source

NFSv4: Ensure that we return the delegation on the target of a rename too.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 19 years ago
parent
commit
24174119c7
1 changed files with 3 additions and 1 deletions
  1. 3 1
      fs/nfs/dir.c

+ 3 - 1
fs/nfs/dir.c

@@ -1550,8 +1550,10 @@ go_ahead:
 	}
 	}
 	nfs_inode_return_delegation(old_inode);
 	nfs_inode_return_delegation(old_inode);
 
 
-	if (new_inode)
+	if (new_inode != NULL) {
+		nfs_inode_return_delegation(new_inode);
 		d_delete(new_dentry);
 		d_delete(new_dentry);
+	}
 
 
 	nfs_begin_data_update(old_dir);
 	nfs_begin_data_update(old_dir);
 	nfs_begin_data_update(new_dir);
 	nfs_begin_data_update(new_dir);