summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2012-09-28 13:17:55 -0700
committerKent Overstreet <koverstreet@google.com>2013-03-23 14:15:27 -0700
commit054bdf646e36c2f7dc1bf6bc6209dbbb5909164b (patch)
treeacd9989fd9e6f5c6d3c985e34e984081a33cbdc3 /include
parent9f060e2231ca96ca94f2ffcff730acd72606b280 (diff)
downloadlinux-054bdf646e36c2f7dc1bf6bc6209dbbb5909164b.tar.gz
linux-054bdf646e36c2f7dc1bf6bc6209dbbb5909164b.tar.xz
block: Add bio_advance()
This is prep work for immutable bio vecs; we first want to centralize where bvecs are modified. Next two patches convert some existing code to use this function. Signed-off-by: Kent Overstreet <koverstreet@google.com> CC: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h2
-rw-r--r--include/linux/blk_types.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 669b1cb18fee..fcb4dba2d8ea 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -248,6 +248,8 @@ extern void bio_endio(struct bio *, int);
struct request_queue;
extern int bio_phys_segments(struct request_queue *, struct bio *);
+extern void bio_advance(struct bio *, unsigned);
+
extern void bio_init(struct bio *);
extern void bio_reset(struct bio *);
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index cdf11191e645..c178d25e588b 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -197,6 +197,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)