Merge tag 'mmc-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[platform/kernel/linux-starfive.git] / drivers / md / dm-target.c

diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 26ea22b..27e2992 100644 (file)
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -85,12 +85,15 @@ int dm_register_target(struct target_type *tt)
        int rv = 0;
 
        down_write(&_lock);
-       if (__find_target_type(tt->name))
+       if (__find_target_type(tt->name)) {
+               DMERR("%s: '%s' target already registered",
+                     __func__, tt->name);
                rv = -EEXIST;
-       else
+       } else {
                list_add(&tt->list, &_targets);
-
+       }
        up_write(&_lock);
+
        return rv;
 }
 EXPORT_SYMBOL(dm_register_target);
@@ -119,6 +122,7 @@ static int io_err_ctr(struct dm_target *tt, unsigned int argc, char **args)
         * Return error for discards instead of -EOPNOTSUPP
         */
        tt->num_discard_bios = 1;
+       tt->discards_supported = true;
 
        return 0;
 }
@@ -145,6 +149,13 @@ static void io_err_release_clone_rq(struct request *clone,
 {
 }
 
+static void io_err_io_hints(struct dm_target *ti, struct queue_limits *limits)
+{
+       limits->max_discard_sectors = UINT_MAX;
+       limits->max_hw_discard_sectors = UINT_MAX;
+       limits->discard_granularity = 512;
+}
+
 static long io_err_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
                long nr_pages, enum dax_access_mode mode, void **kaddr,
                pfn_t *pfn)
@@ -154,13 +165,14 @@ static long io_err_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
 
 static struct target_type error_target = {
        .name = "error",
-       .version = {1, 5, 0},
+       .version = {1, 6, 0},
        .features = DM_TARGET_WILDCARD,
        .ctr  = io_err_ctr,
        .dtr  = io_err_dtr,
        .map  = io_err_map,
        .clone_and_map_rq = io_err_clone_and_map_rq,
        .release_clone_rq = io_err_release_clone_rq,
+       .io_hints = io_err_io_hints,
        .direct_access = io_err_dax_direct_access,
 };