blk-mq: new multi-queue block IO queueing mechanism

[~andy/linux] / include / linux / bio.h

diff --git a/include/linux/bio.h b/include/linux/bio.h
index ef24466d8f82516a76029577df9c8f1ec530cf20..4c2775443dcf8750d90b8ba910fe62b2f89cae0c 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -97,11 +97,11 @@ static inline void *bio_data(struct bio *bio)
  * permanent PIO fall back, user is probably better off disabling highmem
  * I/O completely on that queue (see ide-dma for example)
  */
-#define __bio_kmap_atomic(bio, idx, kmtype)                            \
+#define __bio_kmap_atomic(bio, idx)                            \
        (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) +    \
                bio_iovec_idx((bio), (idx))->bv_offset)
 
-#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr)
+#define __bio_kunmap_atomic(addr) kunmap_atomic(addr)
 
 /*
  * merge helpers etc
@@ -419,6 +419,8 @@ static inline void bio_list_init(struct bio_list *bl)
        bl->head = bl->tail = NULL;
 }
 
+#define BIO_EMPTY_LIST { NULL, NULL }
+
 #define bio_list_for_each(bio, bl) \
        for (bio = (bl)->head; bio; bio = bio->bi_next)