Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bio: define __BIOVEC_PHYS_MERGEABLE

Define __BIOVEC_PHYS_MERGEABLE as the default implementation of
BIOVEC_PHYS_MERGEABLE, so that its available for reuse within an
arch-specific definition of BIOVEC_PHYS_MERGEABLE.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

authored by

Jeremy Fitzhardinge and committed by
Jens Axboe
f92131c3 43381785

+5 -1
+5 -1
include/linux/bio.h
··· 236 236 #define __BVEC_END(bio) bio_iovec_idx((bio), (bio)->bi_vcnt - 1) 237 237 #define __BVEC_START(bio) bio_iovec_idx((bio), (bio)->bi_idx) 238 238 239 + /* Default implementation of BIOVEC_PHYS_MERGEABLE */ 240 + #define __BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ 241 + ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) 242 + 239 243 /* 240 244 * allow arch override, for eg virtualized architectures (put in asm/io.h) 241 245 */ 242 246 #ifndef BIOVEC_PHYS_MERGEABLE 243 247 #define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ 244 - ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) 248 + __BIOVEC_PHYS_MERGEABLE(vec1, vec2) 245 249 #endif 246 250 247 251 #define __BIO_SEG_BOUNDARY(addr1, addr2, mask) \