diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-09-24 09:43:50 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-09-24 12:33:54 -0600 |
| commit | 6a9f5f240adfdced863a098d34f8f05ca6ab9d5f (patch) | |
| tree | eb81b3a3073e9c03c03170468f2ba43ed7f43487 /include/linux/bio.h | |
| parent | block: move req_gap_back_merge to blk.h (diff) | |
| download | linux-dev-6a9f5f240adfdced863a098d34f8f05ca6ab9d5f.tar.xz linux-dev-6a9f5f240adfdced863a098d34f8f05ca6ab9d5f.zip | |
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 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index e973876625a8..e2adb96346f0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -140,19 +140,6 @@ static inline bool bio_full(struct bio *bio) /* * merge helpers etc */ - -/* Default implementation of BIOVEC_PHYS_MERGEABLE */ -#define __BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ - ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) - -/* - * allow arch override, for eg virtualized architectures (put in asm/io.h) - */ -#ifndef BIOVEC_PHYS_MERGEABLE -#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ - __BIOVEC_PHYS_MERGEABLE(vec1, vec2) -#endif - #define __BIO_SEG_BOUNDARY(addr1, addr2, mask) \ (((addr1) | (mask)) == (((addr2) - 1) | (mask))) #define BIOVEC_SEG_BOUNDARY(q, b1, b2) \ |