summaryrefslogtreecommitdiffstats
path: root/drivers/md/dm.c
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2010-08-12 04:14:09 +0100
committerAlasdair G Kergon <agk@redhat.com>2010-08-12 04:14:09 +0100
commit06a426cee9b35505aeb7516a67bd26496ca7ed08 (patch)
tree008d8d20b667b195dbe7e53a53e5003aec0a0a5f /drivers/md/dm.c
parent5ae89a8720c28caf35c4e53711d77df2856c404e (diff)
downloadop-kernel-dev-06a426cee9b35505aeb7516a67bd26496ca7ed08.zip
op-kernel-dev-06a426cee9b35505aeb7516a67bd26496ca7ed08.tar.gz
dm: use common __issue_target_request for flush and discard support
Rename __flush_target to __issue_target_request now that it is used to issue both flush and discard requests. Introduce __issue_target_requests as a convenient wrapper to __issue_target_request 'num_flush_requests' or 'num_discard_requests' times per target. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r--drivers/md/dm.c30
1 files changed, 22 insertions, 8 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 44aba29..3dd846e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1182,30 +1182,42 @@ static struct dm_target_io *alloc_tio(struct clone_info *ci,
return tio;
}
-static void __flush_target(struct clone_info *ci, struct dm_target *ti,
- unsigned request_nr)
+static void __issue_target_request(struct clone_info *ci, struct dm_target *ti,
+ unsigned request_nr)
{
struct dm_target_io *tio = alloc_tio(ci, ti);
struct bio *clone;
tio->info.target_request_nr = request_nr;
- clone = bio_alloc_bioset(GFP_NOIO, 0, ci->md->bs);
+ /*
+ * Discard requests require the bio's inline iovecs be initialized.
+ * ci->bio->bi_max_vecs is BIO_INLINE_VECS anyway, for both flush
+ * and discard, so no need for concern about wasted bvec allocations.
+ */
+ clone = bio_alloc_bioset(GFP_NOIO, ci->bio->bi_max_vecs, ci->md->bs);
__bio_clone(clone, ci->bio);
clone->bi_destructor = dm_bio_destructor;
__map_bio(ti, clone, tio);
}
+static void __issue_target_requests(struct clone_info *ci, struct dm_target *ti,
+ unsigned num_requests)
+{
+ unsigned request_nr;
+
+ for (request_nr = 0; request_nr < num_requests; request_nr++)
+ __issue_target_request(ci, ti, request_nr);
+}
+
static int __clone_and_map_empty_barrier(struct clone_info *ci)
{
- unsigned target_nr = 0, request_nr;
+ unsigned target_nr = 0;
struct dm_target *ti;
while ((ti = dm_table_get_target(ci->map, target_nr++)))
- for (request_nr = 0; request_nr < ti->num_flush_requests;
- request_nr++)
- __flush_target(ci, ti, request_nr);
+ __issue_target_requests(ci, ti, ti->num_flush_requests);
ci->sector_count = 0;
@@ -1254,7 +1266,9 @@ static int __clone_and_map_discard(struct clone_info *ci)
*/
return -EOPNOTSUPP;
- __clone_and_map_simple(ci, ti);
+ __issue_target_requests(ci, ti, ti->num_discard_requests);
+
+ ci->sector_count = 0;
return 0;
}
OpenPOWER on IntegriCloud