diff options
| author | Andreas Gruenbacher | 2010-12-07 10:43:29 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-03-10 11:36:15 +0100 |
| commit | 0cf9d27e38447efe5e5edce155a66a782a5aac4a (patch) | |
| tree | 995f0581eacec75533f6b8918ecd43cfb510c1f5 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Get rid of unnecessary macros (1) (diff) | |
| download | kernel-qcow2-linux-0cf9d27e38447efe5e5edce155a66a782a5aac4a.tar.gz kernel-qcow2-linux-0cf9d27e38447efe5e5edce155a66a782a5aac4a.tar.xz kernel-qcow2-linux-0cf9d27e38447efe5e5edce155a66a782a5aac4a.zip | |
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 55fee1a6c647..d34d093278c7 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -319,7 +319,7 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, struct page *page; 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; 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) __ unsigned len = min_t(int, ds, PAGE_SIZE); data = kmap(page); 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"); data[0] = data[0] ^ (unsigned long)-1; } |