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/md/dm-table.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/md/dm-table.c')
-rw-r--r-- | drivers/md/dm-table.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index f9fc07d7a4b9..90267f8d64ee 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c | |||
@@ -486,11 +486,6 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti, | |||
486 | return 0; | 486 | return 0; |
487 | } | 487 | } |
488 | 488 | ||
489 | /* | ||
490 | * Returns the minimum that is _not_ zero, unless both are zero. | ||
491 | */ | ||
492 | #define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r)) | ||
493 | |||
494 | int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, | 489 | int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, |
495 | sector_t start, sector_t len, void *data) | 490 | sector_t start, sector_t len, void *data) |
496 | { | 491 | { |