Skip to content

Commit 5d54c67

Browse files
lorddoskiaskdave
authored andcommitted
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 <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 9c1036f commit 5d54c67

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

fs/btrfs/ioctl.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,9 +1729,9 @@ static noinline int btrfs_ioctl_resize(struct file *file,
17291729
return ret;
17301730
}
17311731

1732-
static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
1732+
static noinline int __btrfs_ioctl_snap_create(struct file *file,
17331733
const char *name, unsigned long fd, int subvol,
1734-
u64 *transid, bool readonly,
1734+
bool readonly,
17351735
struct btrfs_qgroup_inherit *inherit)
17361736
{
17371737
int namelen;
@@ -1758,7 +1758,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
17581758

17591759
if (subvol) {
17601760
ret = btrfs_mksubvol(&file->f_path, name, namelen,
1761-
NULL, transid, readonly, inherit);
1761+
NULL, readonly, inherit);
17621762
} else {
17631763
struct fd src = fdget(fd);
17641764
struct inode *src_inode;
@@ -1781,7 +1781,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
17811781
} else {
17821782
ret = btrfs_mksubvol(&file->f_path, name, namelen,
17831783
BTRFS_I(src_inode)->root,
1784-
transid, readonly, inherit);
1784+
readonly, inherit);
17851785
}
17861786
fdput(src);
17871787
}
@@ -1805,9 +1805,8 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
18051805
return PTR_ERR(vol_args);
18061806
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
18071807

1808-
ret = btrfs_ioctl_snap_create_transid(file, vol_args->name,
1809-
vol_args->fd, subvol,
1810-
NULL, false, NULL);
1808+
ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
1809+
subvol, false, NULL);
18111810

18121811
kfree(vol_args);
18131812
return ret;
@@ -1848,9 +1847,8 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,
18481847
}
18491848
}
18501849

1851-
ret = btrfs_ioctl_snap_create_transid(file, vol_args->name,
1852-
vol_args->fd, subvol, NULL,
1853-
readonly, inherit);
1850+
ret = __btrfs_ioctl_snap_create(file, vol_args->name, vol_args->fd,
1851+
subvol, readonly, inherit);
18541852
if (ret)
18551853
goto free_inherit;
18561854
free_inherit:

0 commit comments

Comments
 (0)