diff options
| author | ZhangZhen <zhenzhang.zhang@huawei.com> | 2014-05-13 16:36:08 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-09 17:20:51 -0700 |
| commit | 58dfae6365666e26cb2d172dc437773120fc4e1a (patch) | |
| tree | f8bff7528251c99e981e204dc7f2922a252bac15 | |
| parent | 298658414a2f0bea1f05a81876a45c1cd96aa2e0 (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>
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a21a4ac537b..fba7a004e7e 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1503,11 +1503,12 @@ static noinline int btrfs_ioctl_resize(struct file *file, sizestr = vol_args->name; devstr = strchr(sizestr, ':'); if (devstr) { - char *end; sizestr = devstr + 1; *devstr = '\0'; devstr = vol_args->name; - devid = simple_strtoull(devstr, &end, 10); + ret = kstrtoull(devstr, 10, &devid); + if (ret) + goto out_free; if (!devid) { ret = -EINVAL; goto out_free; |