diff options
| author |   Andreas Gruenbacher <agruen@linbit.com> | 2010-12-07 10:43:29 +0100 |
|---|---|---|
| committer |   Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 11:36:15 +0100 |
| commit | 0cf9d27e38447efe5e5edce155a66a782a5aac4a (patch) | |
| tree | 995f0581eacec75533f6b8918ecd43cfb510c1f5 /drivers/block/drbd/drbd_int.h | |
| parent | drbd: Get rid of unnecessary macros (1) (diff) | |
| download | linux-dev-0cf9d27e38447efe5e5edce155a66a782a5aac4a.tar.xz linux-dev-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_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 7514cf7a958c..c81710a42111 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -137,20 +137,19 @@ enum { DRBD_FAULT_MAX, }; -#ifdef CONFIG_DRBD_FAULT_INJECTION extern unsigned int _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type); + static inline int drbd_insert_fault(struct drbd_conf *mdev, unsigned int type) { +#ifdef CONFIG_DRBD_FAULT_INJECTION return fault_rate && (enable_faults & (1<<type)) && _drbd_insert_fault(mdev, type); -} -#define FAULT_ACTIVE(_m, _t) (drbd_insert_fault((_m), (_t))) - #else -#define FAULT_ACTIVE(_m, _t) (0) + return 0; #endif +} /* integer division, round _UP_ to the next integer */ #define div_ceil(A, B) ((A)/(B) + ((A)%(B) ? 1 : 0)) |