Eliminate the DM_TARGET_SUPPORTS_DISCARDS feature flag now that
dm_target's 'num_discard_requests' provides the mechanism to enable
discards on a per target basis.
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
---
drivers/md/dm-linear.c | 1 -
drivers/md/dm-table.c | 2 +-
drivers/md/dm.c | 2 +-
include/linux/device-mapper.h | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 8e925fa..f043b5f 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -153,7 +153,6 @@ static struct target_type linear_target = {
.ioctl = linear_ioctl,
.merge = linear_merge,
.iterate_devices = linear_iterate_devices,
- .features = DM_TARGET_SUPPORTS_DISCARDS,
};
int __init dm_linear_init(void)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 3f6d6b4..8bd0231 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -773,7 +773,7 @@ int dm_table_add_target(struct dm_table *t, const char *type,
t->highs[t->num_targets++] = tgt->begin + tgt->len - 1;
- if (!(tgt->type->features & DM_TARGET_SUPPORTS_DISCARDS))
+ if (!tgt->num_discard_requests)
t->discards_supported = 0;
return 0;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 84a349a..bd480a5 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1229,7 +1229,7 @@ static int __clone_and_map_discard(struct clone_info *ci)
if (!dm_target_is_valid(ti))
return -EIO;
- if (!(ti->type->features & DM_TARGET_SUPPORTS_DISCARDS))
+ if (!ti->num_discard_requests)
return -EOPNOTSUPP;
max = max_io_len(ci->md, ci->sector, ti);
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 0fe597d..751ce21 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -130,7 +130,6 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d);
/*
* Target features
*/
-#define DM_TARGET_SUPPORTS_DISCARDS 0x00000001
struct target_type {
uint64_t features;
--
1.6.6.1
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
