Skip to content

Commit

Permalink
btrfs: Remove transid argument from btrfs_ioctl_snap_create_transid
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nikolay Borisov authored and David Sterba committed Mar 23, 2020
1 parent 9c1036f commit 5d54c67
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1729,9 +1729,9 @@ static noinline int btrfs_ioctl_resize(struct file *file,
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,
u64 *transid, bool readonly,
bool readonly,
struct btrfs_qgroup_inherit *inherit)
{
int namelen;
Expand All @@ -1758,7 +1758,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,

if (subvol) {
ret = btrfs_mksubvol(&file->f_path, name, namelen,
NULL, transid, readonly, inherit);
NULL, readonly, inherit);
} else {
struct fd src = fdget(fd);
struct inode *src_inode;
Expand All @@ -1781,7 +1781,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
} else {
ret = btrfs_mksubvol(&file->f_path, name, namelen,
BTRFS_I(src_inode)->root,
transid, readonly, inherit);
readonly, inherit);
}
fdput(src);
}
Expand All @@ -1805,9 +1805,8 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
return PTR_ERR(vol_args);
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';

ret = btrfs_ioctl_snap_create_transid(file, vol_args->name,
vol_args->fd, subvol,
NULL, false, NULL);
ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
subvol, false, NULL);

kfree(vol_args);
return ret;
Expand Down Expand Up @@ -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,
vol_args->fd, subvol, NULL,
readonly, inherit);
ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
subvol, readonly, inherit);
if (ret)
goto free_inherit;
free_inherit:
Expand Down

0 comments on commit 5d54c67

Please sign in to comment.