commit 58dfae6365666e26cb2d172dc437773120fc4e1a
author ZhangZhen <zhenzhang.zhang@huawei.com> Tue May 13 16:36:08 2014 +0800
committer Chris Mason <clm@fb.com> Mon Jun 09 17:20:51 2014 -0700
tree f8bff7528251c99e981e204dc7f2922a252bac15
parent 298658414a2f0bea1f05a81876a45c1cd96aa2e0

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>

fs/btrfs/ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a21a4ac..fba7a00 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1503,11 +1503,12 @@
 	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;