NFS: Fix rename of directory onto empty directory (6fe43f9e) · Commits · 戴 / test

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>

fs/nfs/dir.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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))
		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) {
		} else if (atomic_read(&new_dentry->d_count) > 2) {
		int err;
		/* copy the target dentry's name */
		dentry = d_alloc(new_dentry->d_parent,

Admin message