diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-11-23 20:19:00 -0500 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-24 01:33:49 -0500 |
commit | 7988613b0e5b2638caf6cd493cc78e9595eba19c (patch) | |
tree | cc9fc4e235278035313ee32940740f61269f8fb3 /drivers/md/raid5.c | |
parent | a4ad39b1d10584dfcfcfb0d510faab2c7f034399 (diff) |
block: Convert bio_for_each_segment() to bvec_iter
More prep work for immutable biovecs - with immutable bvecs drivers
won't be able to use the biovec directly, they'll need to use helpers
that take into account bio->bi_iter.bi_bvec_done.
This updates callers for the new usage without changing the
implementation yet.
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Ed L. Cashin" <ecashin@coraid.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Paul Clements <Paul.Clements@steeleye.com>
Cc: Jim Paris <jim@jtan.com>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Yehuda Sadeh <yehuda@inktank.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Alex Elder <elder@inktank.com>
Cc: ceph-devel@vger.kernel.org
Cc: Joshua Morris <josh.h.morris@us.ibm.com>
Cc: Philip Kelleher <pjk1939@linux.vnet.ibm.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
Cc: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
Cc: support@lsi.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Guo Chao <yan@linux.vnet.ibm.com>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Quoc-Son Anh <quoc-sonx.anh@intel.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Jan Kara <jack@suse.cz>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: drbd-user@lists.linbit.com
Cc: nbd-general@lists.sourceforge.net
Cc: cbe-oss-dev@lists.ozlabs.org
Cc: xen-devel@lists.xensource.com
Cc: virtualization@lists.linux-foundation.org
Cc: linux-raid@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: DL-MPTFusionLinux@lsi.com
Cc: linux-scsi@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: linux-fsdevel@vger.kernel.org
Cc: cluster-devel@redhat.com
Cc: linux-mm@kvack.org
Acked-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a5d9c0ee4d60..bef353c51c04 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -937,9 +937,9 @@ static struct dma_async_tx_descriptor * | |||
937 | async_copy_data(int frombio, struct bio *bio, struct page *page, | 937 | async_copy_data(int frombio, struct bio *bio, struct page *page, |
938 | sector_t sector, struct dma_async_tx_descriptor *tx) | 938 | sector_t sector, struct dma_async_tx_descriptor *tx) |
939 | { | 939 | { |
940 | struct bio_vec *bvl; | 940 | struct bio_vec bvl; |
941 | struct bvec_iter iter; | ||
941 | struct page *bio_page; | 942 | struct page *bio_page; |
942 | int i; | ||
943 | int page_offset; | 943 | int page_offset; |
944 | struct async_submit_ctl submit; | 944 | struct async_submit_ctl submit; |
945 | enum async_tx_flags flags = 0; | 945 | enum async_tx_flags flags = 0; |
@@ -953,8 +953,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, | |||
953 | flags |= ASYNC_TX_FENCE; | 953 | flags |= ASYNC_TX_FENCE; |
954 | init_async_submit(&submit, flags, tx, NULL, NULL, NULL); | 954 | init_async_submit(&submit, flags, tx, NULL, NULL, NULL); |
955 | 955 | ||
956 | bio_for_each_segment(bvl, bio, i) { | 956 | bio_for_each_segment(bvl, bio, iter) { |
957 | int len = bvl->bv_len; | 957 | int len = bvl.bv_len; |
958 | int clen; | 958 | int clen; |
959 | int b_offset = 0; | 959 | int b_offset = 0; |
960 | 960 | ||
@@ -970,8 +970,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, | |||
970 | clen = len; | 970 | clen = len; |
971 | 971 | ||
972 | if (clen > 0) { | 972 | if (clen > 0) { |
973 | b_offset += bvl->bv_offset; | 973 | b_offset += bvl.bv_offset; |
974 | bio_page = bvl->bv_page; | 974 | bio_page = bvl.bv_page; |
975 | if (frombio) | 975 | if (frombio) |
976 | tx = async_memcpy(page, bio_page, page_offset, | 976 | tx = async_memcpy(page, bio_page, page_offset, |
977 | b_offset, clen, &submit); | 977 | b_offset, clen, &submit); |