Commit 4237ba43 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: restructure ->rename2() 



Make ->rename2() universal, i.e. able to handle zero flags.  This is to
make future change of the API easier.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent c55a01d3

fs/fuse/dir.c

+20 −14
Original line number Diff line number Diff line
@@ -815,13 +815,6 @@ static int fuse_rename_common(struct inode *olddir, struct dentry *oldent, 
	return err;

}



static int fuse_rename(struct inode *olddir, struct dentry *oldent,

		       struct inode *newdir, struct dentry *newent)

{

	return fuse_rename_common(olddir, oldent, newdir, newent, 0,

				  FUSE_RENAME, sizeof(struct fuse_rename_in));

}



static int fuse_rename2(struct inode *olddir, struct dentry *oldent,

			struct inode *newdir, struct dentry *newent,

			unsigned int flags)
@@ -832,17 +825,30 @@ static int fuse_rename2(struct inode *olddir, struct dentry *oldent, 
	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE))

		return -EINVAL;



	if (flags) {

		if (fc->no_rename2 || fc->minor < 23)

			return -EINVAL;



		err = fuse_rename_common(olddir, oldent, newdir, newent, flags,

				 FUSE_RENAME2, sizeof(struct fuse_rename2_in));

					 FUSE_RENAME2,

					 sizeof(struct fuse_rename2_in));

		if (err == -ENOSYS) {

			fc->no_rename2 = 1;

			err = -EINVAL;

		}

	} else {

		err = fuse_rename_common(olddir, oldent, newdir, newent, 0,

					 FUSE_RENAME,

					 sizeof(struct fuse_rename_in));

	}



	return err;

}



static int fuse_rename(struct inode *olddir, struct dentry *oldent,

		       struct inode *newdir, struct dentry *newent)

{

	return fuse_rename2(olddir, oldent, newdir, newent, 0);

}



static int fuse_link(struct dentry *entry, struct inode *newdir,