Commit 0a7c3937 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

vfs: add RENAME_NOREPLACE flag 



If this flag is specified and the target of the rename exists then the
rename syscall fails with EEXIST.

The VFS does the existence checking, so it is trivial to enable for most
local filesystems.  This patch only enables it in ext4.

For network filesystems the VFS check is not enough as there may be a race
between a remote create and the rename, so these filesystems need to handle
this flag in their ->rename() implementations to ensure atomicity.

Andy writes about why this is useful:

"The trivial answer: to eliminate the race condition from 'mv -i'.

Another answer: there's a common pattern to atomically create a file
with contents: open a temporary file, write to it, optionally fsync
it, close it, then link(2) it to the final name, then unlink the
temporary file.

The reason to use link(2) is because it won't silently clobber the destination.

This is annoying:
 - It requires an extra system call that shouldn't be necessary.
 - It doesn't work on (IMO sensible) filesystems that don't support
hard links (e.g. vfat).
 - It's not atomic -- there's an intermediate state where both files exist.
 - It's ugly.

The new rename flag will make this totally sensible.

To be fair, on new enough kernels, you can also use O_TMPFILE and
linkat to achieve the same thing even more cleanly."

Suggested-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reviewed-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 520c8b16

fs/ext4/namei.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -3204,6 +3204,16 @@ end_rename: 
	return retval;

	return retval;

}

}





static int ext4_rename2(struct inode *old_dir, struct dentry *old_dentry,

			struct inode *new_dir, struct dentry *new_dentry,

			unsigned int flags)

{

	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;



	return ext4_rename(old_dir, old_dentry, new_dir, new_dentry);

}



/*

/*

 * directories can handle most operations...

 * directories can handle most operations...

 */

 */
@@ -3218,6 +3228,7 @@ const struct inode_operations ext4_dir_inode_operations = { 
	.mknod		= ext4_mknod,

	.mknod		= ext4_mknod,

	.tmpfile	= ext4_tmpfile,

	.tmpfile	= ext4_tmpfile,

	.rename		= ext4_rename,

	.rename		= ext4_rename,

	.rename2	= ext4_rename2,

	.setattr	= ext4_setattr,

	.setattr	= ext4_setattr,

	.setxattr	= generic_setxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.getxattr	= generic_getxattr,

fs/namei.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -4142,7 +4142,7 @@ SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname, 
	bool should_retry = false;

	bool should_retry = false;

	int error;

	int error;





	if (flags)

	if (flags & ~RENAME_NOREPLACE)

		return -EINVAL;

		return -EINVAL;





retry:

retry:
@@ -4168,6 +4168,8 @@ retry: 
		goto exit2;

		goto exit2;





	new_dir = newnd.path.dentry;

	new_dir = newnd.path.dentry;

	if (flags & RENAME_NOREPLACE)

		error = -EEXIST;

	if (newnd.last_type != LAST_NORM)

	if (newnd.last_type != LAST_NORM)

		goto exit2;

		goto exit2;
@@ -4190,22 +4192,25 @@ retry_deleg: 
	error = -ENOENT;

	error = -ENOENT;

	if (d_is_negative(old_dentry))

	if (d_is_negative(old_dentry))

		goto exit4;

		goto exit4;

	new_dentry = lookup_hash(&newnd);

	error = PTR_ERR(new_dentry);

	if (IS_ERR(new_dentry))

		goto exit4;

	error = -EEXIST;

	if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry))

		goto exit5;

	/* unless the source is a directory trailing slashes give -ENOTDIR */

	/* unless the source is a directory trailing slashes give -ENOTDIR */

	if (!d_is_dir(old_dentry)) {

	if (!d_is_dir(old_dentry)) {

		error = -ENOTDIR;

		error = -ENOTDIR;

		if (oldnd.last.name[oldnd.last.len])

		if (oldnd.last.name[oldnd.last.len])

			goto exit4;

			goto exit5;

		if (newnd.last.name[newnd.last.len])

		if (newnd.last.name[newnd.last.len])

			goto exit4;

			goto exit5;

	}

	}

	/* source should not be ancestor of target */

	/* source should not be ancestor of target */

	error = -EINVAL;

	error = -EINVAL;

	if (old_dentry == trap)

	if (old_dentry == trap)

		goto exit4;

		goto exit5;

	new_dentry = lookup_hash(&newnd);

	error = PTR_ERR(new_dentry);

	if (IS_ERR(new_dentry))

		goto exit4;

	/* target should not be an ancestor of source */

	/* target should not be an ancestor of source */

	error = -ENOTEMPTY;

	error = -ENOTEMPTY;

	if (new_dentry == trap)

	if (new_dentry == trap)

include/uapi/linux/fs.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ 
#define SEEK_HOLE	4	/* seek to the next hole */

#define SEEK_HOLE	4	/* seek to the next hole */

#define SEEK_MAX	SEEK_HOLE

#define SEEK_MAX	SEEK_HOLE





#define RENAME_NOREPLACE	(1 << 0)	/* Don't overwrite target */



struct fstrim_range {

struct fstrim_range {

	__u64 start;

	__u64 start;

	__u64 len;

	__u64 len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE