summaryrefslogtreecommitdiff
path: root/include/linux/bvec.h
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2016-05-30 16:34:30 +0300
committerJens Axboe <axboe@fb.com>2016-06-09 19:02:47 +0300
commit0781e79eb206a62c30cc3eff75aaa889cd85b276 (patch)
tree19bae7f4fe30e974076ab8655399aefdd7574dae /include/linux/bvec.h
parent8fc554552c9d89e7bf76cd4cbc0085648bf3125b (diff)
downloadlinux-0781e79eb206a62c30cc3eff75aaa889cd85b276.tar.xz
block: move two bvec structure into bvec.h
This patch moves 'struct bio_vec' and 'struct bvec_iter' into 'include/linux/bvec.h', then always include this header into 'include/linux/blk_types.h'. With this change, both 'struct bvec_iter' and bvec iterator helpers don't depend on CONFIG_BLOCK any more, then we can use bvec iterator to implement iterate_bvec(): lib/iov_iter.c. Reviewed-by: Christoph Hellwig <hch@lst.de> Suggested-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Ming Lei <ming.lei@canonical.com> Tested-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/bvec.h')
-rw-r--r--include/linux/bvec.h23
1 files changed, 22 insertions, 1 deletions
diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index 29c459da277e..096efd2c83e5 100644
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -20,7 +20,28 @@
#ifndef __LINUX_BVEC_ITER_H
#define __LINUX_BVEC_ITER_H
-#include <linux/blk_types.h>
+#include <linux/kernel.h>
+#include <linux/bug.h>
+
+/*
+ * was unsigned short, but we might as well be ready for > 64kB I/O pages
+ */
+struct bio_vec {
+ struct page *bv_page;
+ unsigned int bv_len;
+ unsigned int bv_offset;
+};
+
+struct bvec_iter {
+ sector_t bi_sector; /* device address in 512 byte
+ sectors */
+ unsigned int bi_size; /* residual I/O count */
+
+ unsigned int bi_idx; /* current index into bvl_vec */
+
+ unsigned int bi_bvec_done; /* number of bytes completed in
+ current bvec */
+};
/*
* various member access, note that bio_data should of course not be used