Commit 4f570f99 authored by Alberto Bertogli's avatar Alberto Bertogli Committed by Jens Axboe
Browse files

Do not __always_inline bvec_kmap_irq() and bvec_kunmap_irq() 



So remove both the comment and the inline requirement, going back to the
inline hint.

Signed-off-by: default avatarAlberto Bertogli <albertito@blitiri.com.ar>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent dddb7451

include/linux/bio.h

+2 −6
Original line number Diff line number Diff line
@@ -450,11 +450,8 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; 
/*

 * remember never ever reenable interrupts between a bvec_kmap_irq and

 * bvec_kunmap_irq!

 *

 * This function MUST be inlined - it plays with the CPU interrupt flags.

 */

static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,

		unsigned long *flags)

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

{

	unsigned long addr;
@@ -470,8 +467,7 @@ static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, 
	return (char *) addr + bvec->bv_offset;

}



static __always_inline void bvec_kunmap_irq(char *buffer,

		unsigned long *flags)

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

{

	unsigned long ptr = (unsigned long) buffer & PAGE_MASK;