aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 17:20:22 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 17:20:22 -0400
commit6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9 (patch)
treeedf67143a032c7b7867ee999f1deb01437a6bc99 /fs
parent4c780a4688b421baa896b59778c05d7e068e479f (diff)
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: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 72f50c0117b1..eb50c19fc253 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1511,9 +1511,11 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1511 */ 1511 */
1512 if (!new_inode) 1512 if (!new_inode)
1513 goto go_ahead; 1513 goto go_ahead;
1514 if (S_ISDIR(new_inode->i_mode)) 1514 if (S_ISDIR(new_inode->i_mode)) {
1515 goto out; 1515 error = -EISDIR;
1516 else if (atomic_read(&new_dentry->d_count) > 2) { 1516 if (!S_ISDIR(old_inode->i_mode))
1517 goto out;
1518 } else if (atomic_read(&new_dentry->d_count) > 2) {
1517 int err; 1519 int err;
1518 /* copy the target dentry's name */ 1520 /* copy the target dentry's name */
1519 dentry = d_alloc(new_dentry->d_parent, 1521 dentry = d_alloc(new_dentry->d_parent,