Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

ZhangZhen and committed by
Chris Mason
58dfae63 29865841

+3 -2
+3 -2
fs/btrfs/ioctl.c
··· 1503 1503 sizestr = vol_args->name; 1504 1504 devstr = strchr(sizestr, ':'); 1505 1505 if (devstr) { 1506 - char *end; 1507 1506 sizestr = devstr + 1; 1508 1507 *devstr = '\0'; 1509 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 1512 if (!devid) { 1512 1513 ret = -EINVAL; 1513 1514 goto out_free;