lkml.org 
[lkml]   [2018]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH V6 19/30] md/dm/bcache: conver to bio_for_each_chunk_segment_all and bio_for_each_chunk_all
    From
    Date
    On 2018/6/9 8:30 PM, Ming Lei wrote:
    > In bch_bio_alloc_pages(), bio_for_each_chunk_all() is fine because this
    > helper can only be used on a freshly new bio.
    >
    > For other cases, we conver to bio_for_each_chunk_segment_all() since they needn't
    > to update bvec table.
    >
    > bio_for_each_segment_all() can't be used any more after multipage bvec is
    > enabled, so we have to convert to bio_for_each_chunk_segment_all().
    >
    > Signed-off-by: Ming Lei <ming.lei@redhat.com>

    I am OK with the bcache part. Acked-by: Coly Li <colyli@suse.de>

    Thanks.

    Coly Li

    > ---
    > drivers/md/bcache/btree.c | 3 ++-
    > drivers/md/bcache/util.c | 2 +-
    > drivers/md/dm-crypt.c | 3 ++-
    > drivers/md/raid1.c | 3 ++-
    > 4 files changed, 7 insertions(+), 4 deletions(-)
    >
    > diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
    > index 2a0968c04e21..dc0747c37bdf 100644
    > --- a/drivers/md/bcache/btree.c
    > +++ b/drivers/md/bcache/btree.c
    > @@ -423,8 +423,9 @@ static void do_btree_node_write(struct btree *b)
    > int j;
    > struct bio_vec *bv;
    > void *base = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
    > + struct bvec_chunk_iter citer;
    >
    > - bio_for_each_segment_all(bv, b->bio, j)
    > + bio_for_each_chunk_segment_all(bv, b->bio, j, citer)
    > memcpy(page_address(bv->bv_page),
    > base + j * PAGE_SIZE, PAGE_SIZE);
    >
    > diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
    > index fc479b026d6d..2f05199f7edb 100644
    > --- a/drivers/md/bcache/util.c
    > +++ b/drivers/md/bcache/util.c
    > @@ -268,7 +268,7 @@ int bch_bio_alloc_pages(struct bio *bio, gfp_t gfp_mask)
    > int i;
    > struct bio_vec *bv;
    >
    > - bio_for_each_segment_all(bv, bio, i) {
    > + bio_for_each_chunk_all(bv, bio, i) {
    > bv->bv_page = alloc_page(gfp_mask);
    > if (!bv->bv_page) {
    > while (--bv >= bio->bi_io_vec)
    > diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
    > index da02f4d8e4b9..637ef1b1dc43 100644
    > --- a/drivers/md/dm-crypt.c
    > +++ b/drivers/md/dm-crypt.c
    > @@ -1450,8 +1450,9 @@ static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone)
    > {
    > unsigned int i;
    > struct bio_vec *bv;
    > + struct bvec_chunk_iter citer;
    >
    > - bio_for_each_segment_all(bv, clone, i) {
    > + bio_for_each_chunk_segment_all(bv, clone, i, citer) {
    > BUG_ON(!bv->bv_page);
    > mempool_free(bv->bv_page, &cc->page_pool);
    > }
    > diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
    > index bad28520719b..2a4f1037c680 100644
    > --- a/drivers/md/raid1.c
    > +++ b/drivers/md/raid1.c
    > @@ -2116,13 +2116,14 @@ static void process_checks(struct r1bio *r1_bio)
    > struct page **spages = get_resync_pages(sbio)->pages;
    > struct bio_vec *bi;
    > int page_len[RESYNC_PAGES] = { 0 };
    > + struct bvec_chunk_iter citer;
    >
    > if (sbio->bi_end_io != end_sync_read)
    > continue;
    > /* Now we can 'fixup' the error value */
    > sbio->bi_status = 0;
    >
    > - bio_for_each_segment_all(bi, sbio, j)
    > + bio_for_each_chunk_segment_all(bi, sbio, j, citer)
    > page_len[j] = bi->bv_len;
    >
    > if (!status) {
    >

    \
     
     \ /
      Last update: 2018-06-10 14:39    [W:5.489 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site