Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index aa70f7d43a1a..ebaa4f803eec 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -142,24 +142,19 @@ EXPORT_SYMBOL(dm_exception_store_type_unregister);
 static int set_chunk_size(struct dm_exception_store *store,
                           const char *chunk_size_arg, char **error)
 {
-        unsigned long chunk_size_ulong;
-        char *value;
+        unsigned chunk_size;
 
-        chunk_size_ulong = simple_strtoul(chunk_size_arg, &value, 10);
-        if (*chunk_size_arg == '\0' || *value != '\0' ||
-            chunk_size_ulong > UINT_MAX) {
+        if (kstrtouint(chunk_size_arg, 10, &chunk_size)) {
                 *error = "Invalid chunk size";
                 return -EINVAL;
         }
 
-        if (!chunk_size_ulong) {
+        if (!chunk_size) {
                 store->chunk_size = store->chunk_mask = store->chunk_shift = 0;
                 return 0;
         }
 
-        return dm_exception_store_set_chunk_size(store,
-                                                 (unsigned) chunk_size_ulong,
-                                                 error);
+        return dm_exception_store_set_chunk_size(store, chunk_size, error);
 }
 
 int dm_exception_store_set_chunk_size(struct dm_exception_store *store,