diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2010-09-10 14:07:38 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2010-09-10 14:07:38 -0400 |
| commit | c8bf1336824ebd698d37b71763e1c43190f2229a (patch) | |
| tree | 19948b3c686ba71bb2e85883a5325cec069015b7 /drivers/block/drbd/drbd_receiver.c | |
| parent | 76be97c1fc945db08aae1f1b746012662d643e97 (diff) | |
Consolidate min_not_zero
We have several users of min_not_zero, each of them using their own
definition. Move the define to kernel.h.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@carl.home.kernel.dk>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 081522d3c742..484ecbb6b772 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
| @@ -2972,7 +2972,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) | |||
| 2972 | * we still need to figure out whether we accept that. */ | 2972 | * we still need to figure out whether we accept that. */ |
| 2973 | mdev->p_size = p_size; | 2973 | mdev->p_size = p_size; |
| 2974 | 2974 | ||
| 2975 | #define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r)) | ||
| 2976 | if (get_ldev(mdev)) { | 2975 | if (get_ldev(mdev)) { |
| 2977 | warn_if_differ_considerably(mdev, "lower level device sizes", | 2976 | warn_if_differ_considerably(mdev, "lower level device sizes", |
| 2978 | p_size, drbd_get_max_capacity(mdev->ldev)); | 2977 | p_size, drbd_get_max_capacity(mdev->ldev)); |