[PATCH] include/linux/bio.h: "extern inline" -> "static inline"
"extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9adeb1b409
commit
c2d08dade7
|
@ -314,9 +314,8 @@ void zero_fill_bio(struct bio *bio);
|
||||||
* bvec_kmap_irq and bvec_kunmap_irq!!
|
* bvec_kmap_irq and bvec_kunmap_irq!!
|
||||||
*
|
*
|
||||||
* This function MUST be inlined - it plays with the CPU interrupt flags.
|
* This function MUST be inlined - it plays with the CPU interrupt flags.
|
||||||
* Hence the `extern inline'.
|
|
||||||
*/
|
*/
|
||||||
extern 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;
|
unsigned long addr;
|
||||||
|
|
||||||
|
@ -332,7 +331,7 @@ extern inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
|
||||||
return (char *) addr + bvec->bv_offset;
|
return (char *) addr + bvec->bv_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern 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;
|
unsigned long ptr = (unsigned long) buffer & PAGE_MASK;
|
||||||
|
|
||||||
|
@ -345,7 +344,7 @@ extern inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
|
||||||
#define bvec_kunmap_irq(buf, flags) do { *(flags) = 0; } while (0)
|
#define bvec_kunmap_irq(buf, flags) do { *(flags) = 0; } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
|
static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
|
||||||
unsigned long *flags)
|
unsigned long *flags)
|
||||||
{
|
{
|
||||||
return bvec_kmap_irq(bio_iovec_idx(bio, idx), flags);
|
return bvec_kmap_irq(bio_iovec_idx(bio, idx), flags);
|
||||||
|
|
Loading…
Reference in a new issue