aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-region-hash.c
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2009-12-10 18:52:05 -0500
committerAlasdair G Kergon <agk@redhat.com>2009-12-10 18:52:05 -0500
commitc58098be979509a54021e837a47fcad08db31f94 (patch)
tree88ab7b21dbdac01756d0e835e3e9bc7a1bff7f28 /drivers/md/dm-region-hash.c
parent87968ddd2f3be1c21b932cac30157a83a1c4f935 (diff)
dm raid1: remove bio_endio from dm_rh_mark_nosync
Move bio completion out of dm_rh_mark_nosync in preparation for the next patch. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Reviewed-by: Takahiro Yasui <tyasui@redhat.com> Tested-by: Takahiro Yasui <tyasui@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-region-hash.c')
-rw-r--r--drivers/md/dm-region-hash.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
index 00806b760ccd..5f19ceb6fe91 100644
--- a/drivers/md/dm-region-hash.c
+++ b/drivers/md/dm-region-hash.c
@@ -383,8 +383,6 @@ static void complete_resync_work(struct dm_region *reg, int success)
383/* dm_rh_mark_nosync 383/* dm_rh_mark_nosync
384 * @ms 384 * @ms
385 * @bio 385 * @bio
386 * @done
387 * @error
388 * 386 *
389 * The bio was written on some mirror(s) but failed on other mirror(s). 387 * The bio was written on some mirror(s) but failed on other mirror(s).
390 * We can successfully endio the bio but should avoid the region being 388 * We can successfully endio the bio but should avoid the region being
@@ -392,8 +390,7 @@ static void complete_resync_work(struct dm_region *reg, int success)
392 * 390 *
393 * This function is _not_ safe in interrupt context! 391 * This function is _not_ safe in interrupt context!
394 */ 392 */
395void dm_rh_mark_nosync(struct dm_region_hash *rh, 393void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio)
396 struct bio *bio, unsigned done, int error)
397{ 394{
398 unsigned long flags; 395 unsigned long flags;
399 struct dm_dirty_log *log = rh->log; 396 struct dm_dirty_log *log = rh->log;
@@ -430,7 +427,6 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh,
430 BUG_ON(!list_empty(&reg->list)); 427 BUG_ON(!list_empty(&reg->list));
431 spin_unlock_irqrestore(&rh->region_lock, flags); 428 spin_unlock_irqrestore(&rh->region_lock, flags);
432 429
433 bio_endio(bio, error);
434 if (recovering) 430 if (recovering)
435 complete_resync_work(reg, 0); 431 complete_resync_work(reg, 0);
436} 432}