diff options
| author | Trond Myklebust | 2005-10-18 23:20:22 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2005-10-18 23:20:22 +0200 |
| commit | 6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9 (patch) | |
| tree | edf67143a032c7b7867ee999f1deb01437a6bc99 | |
| parent | Fix Connectathon locking test failure (diff) | |
| download | kernel-qcow2-linux-6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9.tar.gz kernel-qcow2-linux-6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9.tar.xz kernel-qcow2-linux-6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9.zip | |
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>
| -rw-r--r-- | fs/nfs/dir.c | 8 |
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, */ if (!new_inode) goto go_ahead; - if (S_ISDIR(new_inode->i_mode)) - goto out; - else if (atomic_read(&new_dentry->d_count) > 2) { + 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) { int err; /* copy the target dentry's name */ dentry = d_alloc(new_dentry->d_parent, |