block: Turn bvec_k{un,}map_irq() into static inline functions
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 21 Oct 2010 08:32:29 +0000 (10:32 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 21 Oct 2010 08:32:29 +0000 (10:32 +0200)
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
93055c31045a2d5599ec613a0c6cdcefc481a460 ("ps3disk: passing wrong variable =
to
bvec_kunmap_irq()")

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
include/linux/bio.h

index 2c3fd742160715c3c0f43280c35de4c734cd9a9a..ba679992d39b4e08ebf0314b784a72a80dd41506 100644 (file)
@@ -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,