diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-24 09:43:52 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-09-24 12:33:57 -0600 |
| commit | 3dccdae54fe836a22cee9dc6df9fd1708ae075ce (patch) | |
| tree | 95d8808538de6f977086e2603d75694d7c1848bc /include/linux/bio.h | |
| parent | 0e253391a970300fe4ae69d0c1d1ab494eb07508 (diff) | |
| download | linux-3dccdae54fe836a22cee9dc6df9fd1708ae075ce.tar.gz linux-3dccdae54fe836a22cee9dc6df9fd1708ae075ce.tar.bz2 linux-3dccdae54fe836a22cee9dc6df9fd1708ae075ce.zip | |
block: merge BIOVEC_SEG_BOUNDARY into biovec_phys_mergeable
These two checks should always be performed together, so merge them into
a single helper.
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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index e2adb96346f0..9b580e1cb2e8 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -138,14 +138,6 @@ static inline bool bio_full(struct bio *bio) #define bvec_to_phys(bv) (page_to_phys((bv)->bv_page) + (unsigned long) (bv)->bv_offset) /* - * merge helpers etc - */ -#define __BIO_SEG_BOUNDARY(addr1, addr2, mask) \ - (((addr1) | (mask)) == (((addr2) - 1) | (mask))) -#define BIOVEC_SEG_BOUNDARY(q, b1, b2) \ - __BIO_SEG_BOUNDARY(bvec_to_phys((b1)), bvec_to_phys((b2)) + (b2)->bv_len, queue_segment_boundary((q))) - -/* * drivers should _never_ use the all version - the bio may have been split * before it got to the driver and the driver won't own all of it */ |