diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-03-24 21:38:59 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-24 21:38:59 -0600 |
| commit | 705cd0ea1cde2ce9225f1485c5a32c5841cacc5f (patch) | |
| tree | 72bc2c5eded0e04fc5e70ca2bd6df93a2e264112 /include/linux/blk_types.h | |
| parent | c8158819d506a8aedeca53c52dfb709a0aabe011 (diff) | |
| parent | 29ed7813ce5c4661261aeebddb1b8660e0860223 (diff) | |
Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core
This contains Kents prep work for the immutable bio_vecs.
Diffstat (limited to 'include/linux/blk_types.h')
| -rw-r--r-- | include/linux/blk_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index fcc1ce28d5c..e8de67053cd 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -117,6 +117,7 @@ struct bio { * BIO_POOL_IDX() */ #define BIO_RESET_BITS 12 +#define BIO_OWNS_VEC 12 /* bio_free() should free bvec */ #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag))) @@ -198,6 +199,8 @@ enum rq_flag_bits { REQ_SECURE) #define REQ_CLONE_MASK REQ_COMMON_MASK +#define BIO_NO_ADVANCE_ITER_MASK (REQ_DISCARD|REQ_WRITE_SAME) + /* This mask is used for both bio and request merge checking */ #define REQ_NOMERGE_FLAGS \ (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA) |