From: Miklos Szeredi <mszeredi@xxxxxxx>
Comments are wrong or out of date. In particular d_drop() doesn't
free the inode it just unhashes the dentry. And if target is a
directory then it is not checked for being busy.
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
---
fs/nfs/dir.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
Index: linux-2.6/fs/nfs/dir.c
===================================================================
--- linux-2.6.orig/fs/nfs/dir.c 2009-12-02 15:10:33.000000000 +0100
+++ linux-2.6/fs/nfs/dir.c 2009-12-02 15:10:44.000000000 +0100
@@ -1581,7 +1581,7 @@ static int nfs_rename(struct inode *old_
/*
* To prevent any new references to the target during the rename,
- * we unhash the dentry and free the inode in advance.
+ * we unhash the dentry in advance.
*/
if (!d_unhashed(new_dentry)) {
d_drop(new_dentry);
@@ -1594,12 +1594,10 @@ static int nfs_rename(struct inode *old_
atomic_read(&new_dentry->d_count));
/*
- * First check whether the target is busy ... we can't
- * safely do _any_ rename if the target is in use.
- *
- * For files, make a copy of the dentry and then do a
- * silly-rename. If the silly-rename succeeds, the
- * copied dentry is hashed and becomes the new target.
+ * For non-directories, check whether the target is busy and if so,
+ * make a copy of the dentry and then do a silly-rename. If the
+ * silly-rename succeeds, the copied dentry is hashed and becomes
+ * the new target.
*/
if (new_inode && !S_ISDIR(new_inode->i_mode) &&
atomic_read(&new_dentry->d_count) > 2) {
--
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
