Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a691be authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jens Axboe
Browse files

block: Turn bvec_k{un,}map_irq() into static inline functions 



Convert bvec_k{un,}map_irq() from macros to static inline functions if
!CONFIG_HIGHMEM, so we can easier detect mistakes like the one fixed in
93055c31 ("ps3disk: passing wrong variable =
to
bvec_kunmap_irq()")

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 7681bfee

include/linux/bio.h

+9 −2
Original line number Diff line number Diff line
@@ -346,8 +346,15 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) 
}



#else

#define bvec_kmap_irq(bvec, flags)	(page_address((bvec)->bv_page) + (bvec)->bv_offset)

#define bvec_kunmap_irq(buf, flags)	do { *(flags) = 0; } while (0)

static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)

{

	return page_address(bvec->bv_page) + bvec->bv_offset;

}



static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)

{

	*flags = 0;

}

#endif



static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,