Commit 0cf9d27e authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 662d91a2
...@@ -92,7 +92,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, ...@@ -92,7 +92,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
bio->bi_end_io = drbd_md_io_complete; bio->bi_end_io = drbd_md_io_complete;
bio->bi_rw = rw; bio->bi_rw = rw;
if (FAULT_ACTIVE(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) if (drbd_insert_fault(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD))
bio_endio(bio, -EIO); bio_endio(bio, -EIO);
else else
submit_bio(rw, bio); submit_bio(rw, bio);
...@@ -685,7 +685,7 @@ void drbd_al_to_on_disk_bm(struct drbd_conf *mdev) ...@@ -685,7 +685,7 @@ void drbd_al_to_on_disk_bm(struct drbd_conf *mdev)
for (i = 0; i < nr_elements; i++) { for (i = 0; i < nr_elements; i++) {
if (bios[i] == NULL) if (bios[i] == NULL)
break; break;
if (FAULT_ACTIVE(mdev, DRBD_FAULT_MD_WR)) { if (drbd_insert_fault(mdev, DRBD_FAULT_MD_WR)) {
bios[i]->bi_rw = WRITE; bios[i]->bi_rw = WRITE;
bio_endio(bios[i], -EIO); bio_endio(bios[i], -EIO);
} else { } else {
......
...@@ -502,7 +502,7 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits) ...@@ -502,7 +502,7 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits)
D_ASSERT(b->bm_pages != NULL); D_ASSERT(b->bm_pages != NULL);
npages = b->bm_pages; npages = b->bm_pages;
} else { } else {
if (FAULT_ACTIVE(mdev, DRBD_FAULT_BM_ALLOC)) if (drbd_insert_fault(mdev, DRBD_FAULT_BM_ALLOC))
npages = NULL; npages = NULL;
else else
npages = bm_realloc_pages(b, want); 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,7 +768,7 @@ static void bm_page_io_async(struct drbd_conf *mdev, struct drbd_bitmap *b, int
bio->bi_private = b; bio->bi_private = b;
bio->bi_end_io = bm_async_io_complete; bio->bi_end_io = bm_async_io_complete;
if (FAULT_ACTIVE(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) { if (drbd_insert_fault(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) {
bio->bi_rw |= rw; bio->bi_rw |= rw;
bio_endio(bio, -EIO); bio_endio(bio, -EIO);
} else { } else {
......
...@@ -137,20 +137,19 @@ enum { ...@@ -137,20 +137,19 @@ enum {
DRBD_FAULT_MAX, DRBD_FAULT_MAX,
}; };
#ifdef CONFIG_DRBD_FAULT_INJECTION
extern unsigned int extern unsigned int
_drbd_insert_fault(struct drbd_conf *mdev, unsigned int type); _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type);
static inline int static inline int
drbd_insert_fault(struct drbd_conf *mdev, unsigned int type) { drbd_insert_fault(struct drbd_conf *mdev, unsigned int type) {
#ifdef CONFIG_DRBD_FAULT_INJECTION
return fault_rate && return fault_rate &&
(enable_faults & (1<<type)) && (enable_faults & (1<<type)) &&
_drbd_insert_fault(mdev, type); _drbd_insert_fault(mdev, type);
}
#define FAULT_ACTIVE(_m, _t) (drbd_insert_fault((_m), (_t)))
#else #else
#define FAULT_ACTIVE(_m, _t) (0) return 0;
#endif #endif
}
/* integer division, round _UP_ to the next integer */ /* integer division, round _UP_ to the next integer */
#define div_ceil(A, B) ((A)/(B) + ((A)%(B) ? 1 : 0)) #define div_ceil(A, B) ((A)/(B) + ((A)%(B) ? 1 : 0))
......
...@@ -319,7 +319,7 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, ...@@ -319,7 +319,7 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev,
struct page *page; struct page *page;
unsigned nr_pages = (data_size + PAGE_SIZE -1) >> PAGE_SHIFT; unsigned nr_pages = (data_size + PAGE_SIZE -1) >> PAGE_SHIFT;
if (FAULT_ACTIVE(mdev, DRBD_FAULT_AL_EE)) if (drbd_insert_fault(mdev, DRBD_FAULT_AL_EE))
return NULL; return NULL;
e = mempool_alloc(drbd_ee_mempool, gfp_mask & ~__GFP_HIGHMEM); e = mempool_alloc(drbd_ee_mempool, gfp_mask & ~__GFP_HIGHMEM);
...@@ -1264,7 +1264,7 @@ read_in_block(struct drbd_conf *mdev, u64 id, sector_t sector, int data_size) __ ...@@ -1264,7 +1264,7 @@ read_in_block(struct drbd_conf *mdev, u64 id, sector_t sector, int data_size) __
unsigned len = min_t(int, ds, PAGE_SIZE); unsigned len = min_t(int, ds, PAGE_SIZE);
data = kmap(page); data = kmap(page);
rr = drbd_recv(mdev, data, len); rr = drbd_recv(mdev, data, len);
if (FAULT_ACTIVE(mdev, DRBD_FAULT_RECEIVE)) { if (drbd_insert_fault(mdev, DRBD_FAULT_RECEIVE)) {
dev_err(DEV, "Fault injection: Corrupting data on receive\n"); dev_err(DEV, "Fault injection: Corrupting data on receive\n");
data[0] = data[0] ^ (unsigned long)-1; data[0] = data[0] ^ (unsigned long)-1;
} }
......
...@@ -1020,9 +1020,9 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns ...@@ -1020,9 +1020,9 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns
* stable storage, and this is a WRITE, we may not even submit * stable storage, and this is a WRITE, we may not even submit
* this bio. */ * this bio. */
if (get_ldev(mdev)) { if (get_ldev(mdev)) {
if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR if (drbd_insert_fault(mdev, rw == WRITE ? DRBD_FAULT_DT_WR
: rw == READ ? DRBD_FAULT_DT_RD : rw == READ ? DRBD_FAULT_DT_RD
: DRBD_FAULT_DT_RA)) : DRBD_FAULT_DT_RA))
bio_endio(req->private_bio, -EIO); bio_endio(req->private_bio, -EIO);
else else
generic_make_request(req->private_bio); generic_make_request(req->private_bio);
......
...@@ -39,7 +39,7 @@ static inline void drbd_generic_make_request(struct drbd_conf *mdev, ...@@ -39,7 +39,7 @@ static inline void drbd_generic_make_request(struct drbd_conf *mdev,
return; return;
} }
if (FAULT_ACTIVE(mdev, fault_type)) if (drbd_insert_fault(mdev, fault_type))
bio_endio(bio, -EIO); bio_endio(bio, -EIO);
else else
generic_make_request(bio); generic_make_request(bio);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment