block: simplify and cleanup bvec pool handling

[karo-tx-linux.git] / include / linux / bio.h

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 4568647269a75ac205b6bccabb15dbbcf67ae2a2..141cfa95a185519f61c57b331c068d6e1958e091 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -44,21 +44,8 @@
 #define BIO_MAX_SIZE           (BIO_MAX_PAGES << PAGE_SHIFT)
 #define BIO_MAX_SECTORS                (BIO_MAX_SIZE >> 9)
 
-#define bio_op(bio)                            (op_from_rq_bits((bio)->bi_rw))
-#define bio_set_op_attrs(bio, op, flags)       ((bio)->bi_rw |= (op | flags))
-
-/*
- * upper 16 bits of bi_rw define the io priority of this bio
- */
-#define BIO_PRIO_SHIFT (8 * sizeof(unsigned long) - IOPRIO_BITS)
-#define bio_prio(bio)  ((bio)->bi_rw >> BIO_PRIO_SHIFT)
-#define bio_prio_valid(bio)    ioprio_valid(bio_prio(bio))
-
-#define bio_set_prio(bio, prio)                do {                    \
-       WARN_ON(prio >= (1 << IOPRIO_BITS));                    \
-       (bio)->bi_rw &= ((1UL << BIO_PRIO_SHIFT) - 1);          \
-       (bio)->bi_rw |= ((unsigned long) (prio) << BIO_PRIO_SHIFT);     \
-} while (0)
+#define bio_prio(bio)                  (bio)->bi_ioprio
+#define bio_set_prio(bio, prio)                ((bio)->bi_ioprio = prio)
 
 /*
  * various member access, note that bio_data should of course not be used
@@ -728,8 +715,6 @@ static inline void bio_inc_remaining(struct bio *bio)
  * and the bvec_slabs[].
  */
 #define BIO_POOL_SIZE 2
-#define BIOVEC_NR_POOLS 6
-#define BIOVEC_MAX_IDX (BIOVEC_NR_POOLS - 1)
 
 struct bio_set {
        struct kmem_cache *bio_slab;