diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-24 03:43:50 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-09-24 14:33:54 -0400 |
| commit | 6a9f5f240adfdced863a098d34f8f05ca6ab9d5f (patch) | |
| tree | eb81b3a3073e9c03c03170468f2ba43ed7f43487 /block/blk-integrity.c | |
| parent | 27ca1d4ed04ea29dc77b47190a3cc82697023e76 (diff) | |
block: simplify BIOVEC_PHYS_MERGEABLE
Turn the macro into an inline, move it to blk.h and simplify the
arch hooks a bit.
Also rename the function to biovec_phys_mergeable as there is no need
to shout.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-integrity.c')
| -rw-r--r-- | block/blk-integrity.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 6121611e1316..0f7267916509 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c | |||
| @@ -49,7 +49,7 @@ int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *bio) | |||
| 49 | bio_for_each_integrity_vec(iv, bio, iter) { | 49 | bio_for_each_integrity_vec(iv, bio, iter) { |
| 50 | 50 | ||
| 51 | if (prev) { | 51 | if (prev) { |
| 52 | if (!BIOVEC_PHYS_MERGEABLE(&ivprv, &iv)) | 52 | if (!biovec_phys_mergeable(&ivprv, &iv)) |
| 53 | goto new_segment; | 53 | goto new_segment; |
| 54 | 54 | ||
| 55 | if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv)) | 55 | if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv)) |
| @@ -95,7 +95,7 @@ int blk_rq_map_integrity_sg(struct request_queue *q, struct bio *bio, | |||
| 95 | bio_for_each_integrity_vec(iv, bio, iter) { | 95 | bio_for_each_integrity_vec(iv, bio, iter) { |
| 96 | 96 | ||
| 97 | if (prev) { | 97 | if (prev) { |
| 98 | if (!BIOVEC_PHYS_MERGEABLE(&ivprv, &iv)) | 98 | if (!biovec_phys_mergeable(&ivprv, &iv)) |
| 99 | goto new_segment; | 99 | goto new_segment; |
| 100 | 100 | ||
| 101 | if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv)) | 101 | if (!BIOVEC_SEG_BOUNDARY(q, &ivprv, &iv)) |