summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-11 17:20:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 18:56:56 -0400
commitbb8e0e84b30afc9827931c9773d75d5c99fcddff (patch)
tree1d1b6b4135933cc375570f6016d8295299c916f6
parente1403b8edf669ff49bbdf602cc97fefa2760cb15 (diff)
block: replace strict_strtoul() with kstrtoul()
The use of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/osdblk.c2
-rw-r--r--drivers/block/rbd.c2
-rw-r--r--drivers/block/xen-blkback/xenbus.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 1bbc681688e4..79aa179305b5 100644
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -598,7 +598,7 @@ static ssize_t class_osdblk_remove(struct class *c,
598 unsigned long ul; 598 unsigned long ul;
599 struct list_head *tmp; 599 struct list_head *tmp;
600 600
601 rc = strict_strtoul(buf, 10, &ul); 601 rc = kstrtoul(buf, 10, &ul);
602 if (rc) 602 if (rc)
603 return rc; 603 return rc;
604 604
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 39c51cc7fabc..b22a7d0fe5b7 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5132,7 +5132,7 @@ static ssize_t rbd_remove(struct bus_type *bus,
5132 bool already = false; 5132 bool already = false;
5133 int ret; 5133 int ret;
5134 5134
5135 ret = strict_strtoul(buf, 10, &ul); 5135 ret = kstrtoul(buf, 10, &ul);
5136 if (ret) 5136 if (ret)
5137 return ret; 5137 return ret;
5138 5138
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index fe5c3cd10c34..c2014a0aa206 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -620,7 +620,7 @@ static void backend_changed(struct xenbus_watch *watch,
620 } 620 }
621 621
622 /* Front end dir is a number, which is used as the handle. */ 622 /* Front end dir is a number, which is used as the handle. */
623 err = strict_strtoul(strrchr(dev->otherend, '/') + 1, 0, &handle); 623 err = kstrtoul(strrchr(dev->otherend, '/') + 1, 0, &handle);
624 if (err) 624 if (err)
625 return; 625 return;
626 626