Commit 6fe43f9e authored by Trond Myklebust's avatar Trond Myklebust

NFS: Fix rename of directory onto empty directory

 If someone tries to rename a directory onto an empty directory, we
 currently fail and return EBUSY.
 This patch ensures that we try the rename if both source and target
 are directories, and that we fail with a correct error of EISDIR if
 the source is not a directory.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4c780a46
...@@ -1511,9 +1511,11 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1511,9 +1511,11 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
*/ */
if (!new_inode) if (!new_inode)
goto go_ahead; goto go_ahead;
if (S_ISDIR(new_inode->i_mode)) if (S_ISDIR(new_inode->i_mode)) {
error = -EISDIR;
if (!S_ISDIR(old_inode->i_mode))
goto out; goto out;
else if (atomic_read(&new_dentry->d_count) > 2) { } else if (atomic_read(&new_dentry->d_count) > 2) {
int err; int err;
/* copy the target dentry's name */ /* copy the target dentry's name */
dentry = d_alloc(new_dentry->d_parent, dentry = d_alloc(new_dentry->d_parent,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment