From: Miklos Szeredi <[email protected]>
VFS already checks if both source and target are directories.
Signed-off-by: Miklos Szeredi <[email protected]>
---
fs/nfs/dir.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
Index: linux-2.6/fs/nfs/dir.c
===================================================================
--- linux-2.6.orig/fs/nfs/dir.c 2009-12-02 13:46:12.000000000 +0100
+++ linux-2.6/fs/nfs/dir.c 2009-12-02 15:10:33.000000000 +0100
@@ -1601,13 +1601,8 @@ static int nfs_rename(struct inode *old_
* silly-rename. If the silly-rename succeeds, the
* copied dentry is hashed and becomes the new target.
*/
- if (!new_inode)
- goto go_ahead;
- if (S_ISDIR(new_inode->i_mode)) {
- error = -EISDIR;
- if (!S_ISDIR(old_inode->i_mode))
- goto out;
- } else if (atomic_read(&new_dentry->d_count) > 2) {
+ if (new_inode && !S_ISDIR(new_inode->i_mode) &&
+ atomic_read(&new_dentry->d_count) > 2) {
int err;
/* copy the target dentry's name */
dentry = d_alloc(new_dentry->d_parent,
@@ -1627,7 +1622,6 @@ static int nfs_rename(struct inode *old_
goto out;
}
-go_ahead:
/*
* ... prune child dentries and writebacks if needed.
*/
--