5 files changed, 20 insertions, 15 deletions

diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c
index 69dddeab124c..5936de71883f 100644
--- a/drivers/md/dm-cache-metadata.c
+++ b/drivers/md/dm-cache-metadata.c
@@ -1455,8 +1455,8 @@ static int __load_mappings(struct dm_cache_metadata *cmd,
                 if (hints_valid) {
                         r = dm_array_cursor_next(&cmd->hint_cursor);
                         if (r) {
-                                DMERR("dm_array_cursor_next for hint failed");
-                                goto out;
+                                dm_array_cursor_end(&cmd->hint_cursor);
+                                hints_valid = false;
                         }
                 }
 
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index a53413371725..e13d991e9fb5 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -3009,8 +3009,13 @@ static dm_cblock_t get_cache_dev_size(struct cache *cache)
 
 static bool can_resize(struct cache *cache, dm_cblock_t new_size)
 {
-        if (from_cblock(new_size) > from_cblock(cache->cache_size))
-                return true;
+        if (from_cblock(new_size) > from_cblock(cache->cache_size)) {
+                if (cache->sized) {
+                        DMERR("%s: unable to extend cache due to missing cache table reload",
+                              cache_device_name(cache));
+                        return false;
+                }
+        }
 
         /*
          * We can't drop a dirty block when shrinking the cache.
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index d94ba6f72ff5..419362c2d8ac 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -806,19 +806,19 @@ static int parse_path_selector(struct dm_arg_set *as, struct priority_group *pg,
 }
 
 static int setup_scsi_dh(struct block_device *bdev, struct multipath *m,
-                         const char *attached_handler_name, char **error)
+                         const char **attached_handler_name, char **error)
 {
         struct request_queue *q = bdev_get_queue(bdev);
         int r;
 
         if (test_bit(MPATHF_RETAIN_ATTACHED_HW_HANDLER, &m->flags)) {
 retain:
-                if (attached_handler_name) {
+                if (*attached_handler_name) {
                         /*
                          * Clear any hw_handler_params associated with a
                          * handler that isn't already attached.
                          */
-                        if (m->hw_handler_name && strcmp(attached_handler_name, m->hw_handler_name)) {
+                        if (m->hw_handler_name && strcmp(*attached_handler_name, m->hw_handler_name)) {
                                 kfree(m->hw_handler_params);
                                 m->hw_handler_params = NULL;
                         }
@@ -830,7 +830,8 @@ retain:
                          * handler instead of the original table passed in.
                          */
                         kfree(m->hw_handler_name);
-                        m->hw_handler_name = attached_handler_name;
+                        m->hw_handler_name = *attached_handler_name;
+                        *attached_handler_name = NULL;
                 }
         }
 
@@ -867,7 +868,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps
         struct pgpath *p;
         struct multipath *m = ti->private;
         struct request_queue *q;
-        const char *attached_handler_name;
+        const char *attached_handler_name = NULL;
 
         /* we need at least a path arg */
         if (as->argc < 1) {
@@ -890,7 +891,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps
         attached_handler_name = scsi_dh_attached_handler_name(q, GFP_KERNEL);
         if (attached_handler_name || m->hw_handler_name) {
                 INIT_DELAYED_WORK(&p->activate_path, activate_path_work);
-                r = setup_scsi_dh(p->path.dev->bdev, m, attached_handler_name, &ti->error);
+                r = setup_scsi_dh(p->path.dev->bdev, m, &attached_handler_name, &ti->error);
                 if (r) {
                         dm_put_device(ti, p->path.dev);
                         goto bad;
@@ -905,6 +906,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps
 
         return p;
  bad:
+        kfree(attached_handler_name);
         free_pgpath(p);
         return ERR_PTR(r);
 }
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 5ba067fa0c72..c44925e4e481 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3353,7 +3353,7 @@ static const char *sync_str(enum sync_state state)
 };
 
 /* Return enum sync_state for @mddev derived from @recovery flags */
-static const enum sync_state decipher_sync_action(struct mddev *mddev, unsigned long recovery)
+static enum sync_state decipher_sync_action(struct mddev *mddev, unsigned long recovery)
 {
         if (test_bit(MD_RECOVERY_FROZEN, &recovery))
                 return st_frozen;
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index 74f6770c70b1..20b0776e39ef 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -832,10 +832,8 @@ static void __set_metadata_reserve(struct dm_pool_metadata *pmd)
         if (r) {
                 DMERR("could not get size of metadata device");
                 pmd->metadata_reserve = max_blocks;
-        } else {
-                sector_div(total, 10);
-                pmd->metadata_reserve = min(max_blocks, total);
-        }
+        } else
+                pmd->metadata_reserve = min(max_blocks, div_u64(total, 10));
 }
 
 struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,