hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: Remove transid argument from btrfs_ioctl_snap_create_transid 

btrfs_ioctl_snap_create_transid no longer takes a transid argument, so
remove it and rename the function to __btrfs_ioctl_snap_create to
reflect it's an internal, worker function.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2020-03-13 17:23:19 +02:00 committed by David Sterba
parent 9c1036fdb1
commit 5d54c67ecc
1 changed files with 8 additions and 10 deletions
fs/btrfs
ioctl.c

18
fs/btrfs/ioctl.c
View File

@ -1729,9 +1729,9 @@ out:
return ret; return ret;
} }
static noinline int btrfs_ioctl_snap_create_transid(struct file *file, static noinline int __btrfs_ioctl_snap_create(struct file *file,
const char *name, unsigned long fd, int subvol, const char *name, unsigned long fd, int subvol,
u64 *transid, bool readonly, bool readonly,
struct btrfs_qgroup_inherit *inherit) struct btrfs_qgroup_inherit *inherit)
{ {
int namelen; int namelen;
@ -1758,7 +1758,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
if (subvol) { if (subvol) {
ret = btrfs_mksubvol(&file->f_path, name, namelen, ret = btrfs_mksubvol(&file->f_path, name, namelen,
NULL, transid, readonly, inherit); NULL, readonly, inherit);
} else { } else {
struct fd src = fdget(fd); struct fd src = fdget(fd);
struct inode *src_inode; struct inode *src_inode;
@ -1781,7 +1781,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
} else { } else {
ret = btrfs_mksubvol(&file->f_path, name, namelen, ret = btrfs_mksubvol(&file->f_path, name, namelen,
BTRFS_I(src_inode)->root, BTRFS_I(src_inode)->root,
transid, readonly, inherit); readonly, inherit);
} }
fdput(src); fdput(src);
} }
@ -1805,9 +1805,8 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
return PTR_ERR(vol_args); return PTR_ERR(vol_args);
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0'; vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
ret = btrfs_ioctl_snap_create_transid(file, vol_args->name, ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
vol_args->fd, subvol, subvol, false, NULL);
NULL, false, NULL);
kfree(vol_args); kfree(vol_args);
return ret; return ret;
@ -1848,9 +1847,8 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,
} }
} }
ret = btrfs_ioctl_snap_create_transid(file, vol_args->name, ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
vol_args->fd, subvol, NULL, subvol, readonly, inherit);
readonly, inherit);
if (ret) if (ret)
goto free_inherit; goto free_inherit;
free_inherit: free_inherit: