aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorZhangZhen <zhenzhang.zhang@huawei.com>2014-05-13 04:36:08 -0400
committerChris Mason <clm@fb.com>2014-06-09 20:20:51 -0400
commit58dfae6365666e26cb2d172dc437773120fc4e1a (patch)
treef8bff7528251c99e981e204dc7f2922a252bac15 /fs/btrfs
parent298658414a2f0bea1f05a81876a45c1cd96aa2e0 (diff)
btrfs: replace simple_strtoull() with kstrtoull()
use the newer and more pleasant kstrtoull() to replace simple_strtoull(), because simple_strtoull() is marked for obsoletion. Signed-off-by: Zhang Zhen <zhenzhang.zhang@huawei.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ioctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a21a4ac537b7..fba7a004e7e5 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1503,11 +1503,12 @@ static noinline int btrfs_ioctl_resize(struct file *file,
1503 sizestr = vol_args->name; 1503 sizestr = vol_args->name;
1504 devstr = strchr(sizestr, ':'); 1504 devstr = strchr(sizestr, ':');
1505 if (devstr) { 1505 if (devstr) {
1506 char *end;
1507 sizestr = devstr + 1; 1506 sizestr = devstr + 1;
1508 *devstr = '\0'; 1507 *devstr = '\0';
1509 devstr = vol_args->name; 1508 devstr = vol_args->name;
1510 devid = simple_strtoull(devstr, &end, 10); 1509 ret = kstrtoull(devstr, 10, &devid);
1510 if (ret)
1511 goto out_free;
1511 if (!devid) { 1512 if (!devid) {
1512 ret = -EINVAL; 1513 ret = -EINVAL;
1513 goto out_free; 1514 goto out_free;