diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2010-12-07 04:43:29 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:36:15 -0500 |
commit | 0cf9d27e38447efe5e5edce155a66a782a5aac4a (patch) | |
tree | 995f0581eacec75533f6b8918ecd43cfb510c1f5 /drivers/block/drbd/drbd_bitmap.c | |
parent | 662d91a23a8e8451ca47c08d5cff710fd080fd3a (diff) |
drbd: Get rid of unnecessary macros (2)
The FAULT_ACTIVE macro just wraps the drbd_insert_fault macro for no
apparent reason.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_bitmap.c')
-rw-r--r-- | drivers/block/drbd/drbd_bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 0645ca829a9..5dafbabe961 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c | |||
@@ -502,7 +502,7 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits) | |||
502 | D_ASSERT(b->bm_pages != NULL); | 502 | D_ASSERT(b->bm_pages != NULL); |
503 | npages = b->bm_pages; | 503 | npages = b->bm_pages; |
504 | } else { | 504 | } else { |
505 | if (FAULT_ACTIVE(mdev, DRBD_FAULT_BM_ALLOC)) | 505 | if (drbd_insert_fault(mdev, DRBD_FAULT_BM_ALLOC)) |
506 | npages = NULL; | 506 | npages = NULL; |
507 | else | 507 | else |
508 | npages = bm_realloc_pages(b, want); | 508 | npages = bm_realloc_pages(b, want); |
@@ -768,7 +768,7 @@ static void bm_page_io_async(struct drbd_conf *mdev, struct drbd_bitmap *b, int | |||
768 | bio->bi_private = b; | 768 | bio->bi_private = b; |
769 | bio->bi_end_io = bm_async_io_complete; | 769 | bio->bi_end_io = bm_async_io_complete; |
770 | 770 | ||
771 | if (FAULT_ACTIVE(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) { | 771 | if (drbd_insert_fault(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) { |
772 | bio->bi_rw |= rw; | 772 | bio->bi_rw |= rw; |
773 | bio_endio(bio, -EIO); | 773 | bio_endio(bio, -EIO); |
774 | } else { | 774 | } else { |