Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ace85c authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

btrfs: add RENAME_NOREPLACE 



RENAME_NOREPLACE is trivial to implement for most filesystems: switch over
to ->rename2() and check for the supported flags.  The rest is done by the
VFS.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a0dbc566

fs/btrfs/inode.c

+11 −1
Original line number Diff line number Diff line
@@ -8476,6 +8476,16 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	return ret;

}



static int btrfs_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 btrfs_rename(old_dir, old_dentry, new_dir, new_dentry);

}



static void btrfs_run_delalloc_work(struct btrfs_work *work)

{

	struct btrfs_delalloc_work *delalloc_work;
@@ -9019,7 +9029,7 @@ static const struct inode_operations btrfs_dir_inode_operations = { 
	.link		= btrfs_link,

	.mkdir		= btrfs_mkdir,

	.rmdir		= btrfs_rmdir,

	.rename		= btrfs_rename,

	.rename2	= btrfs_rename2,

	.symlink	= btrfs_symlink,

	.setattr	= btrfs_setattr,

	.mknod		= btrfs_mknod,