From patchwork Sat Jun 9 12:30:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10455611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 38B5F60467 for ; Sat, 9 Jun 2018 12:34:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A9B11FF83 for ; Sat, 9 Jun 2018 12:34:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F351223A6; Sat, 9 Jun 2018 12:34:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 889FE1FF83 for ; Sat, 9 Jun 2018 12:34:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C2626B028A; Sat, 9 Jun 2018 08:34:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 770636B028C; Sat, 9 Jun 2018 08:34:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65F4B6B028D; Sat, 9 Jun 2018 08:34:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id 39C716B028A for ; Sat, 9 Jun 2018 08:34:42 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id f8-v6so4524137qth.9 for ; Sat, 09 Jun 2018 05:34:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=jRoYMCZ7f18EmOTomklG1WV7buq2BDQ67jVm3QabE8I=; b=LlXBqU+YVFWvErXxuF9xpfUK8y8WNT+IAgsgy0crKzdWfQjvgOXDfcaujpiwzVhnT9 YSIZNE9C7U58iNK4HqpQNAWVWKMs26Mec2IdcusV3XnYPojxTEIIzj4I/ShkzOuaDpNe bCV/cIN9Eg1MviNB+O/ZdrFEZQw4rTFxH33PmPjlcSggkGZF8IbMIA+ieR4tZeiAw4Z9 H+/M9/Vb4BhGPmujmTWzO20ZSc4LmS0KZMtn3cysfh6IDnvvxC8OUJWAHmPUT6s2bNc9 IVM7kIsfZctnmNl2YSnIxgNKAcNzUKzBhGh5KkfIYIvoK4Ma4JPsUIYQY503yfNg19Ug GIuw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APt69E30V4C32eNtapcNmRYrcPIufoUubFSYKTqtfP3z2GHMfudLshoi eaCwWEb609kBnq7aw8DleovMUQn7UL3xcQwoNuIJNKnbyttZ5hYGq9aGOknChpol1XjjQklyFTh uEahRGF4Ht4JwUJUacLzqUaWUf5VsVSHRRcy8YR5aJl0iCdOwrlMwphfLQ4s8Ve1e3g== X-Received: by 2002:a0c:81cc:: with SMTP id 12-v6mr8866792qve.4.1528547682035; Sat, 09 Jun 2018 05:34:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKDvTdLYs6Ksm89luYgvsxWwtCpdy4PWnPL/T1yh7pvxxrJV1MLuLkCy0swecnuintQSCqp X-Received: by 2002:a0c:81cc:: with SMTP id 12-v6mr8866758qve.4.1528547681173; Sat, 09 Jun 2018 05:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528547681; cv=none; d=google.com; s=arc-20160816; b=f3FqxroIHCEzJtpUjH2jcwkGaPQSXFmCnAwf0TBDkJPDZhlfNB8KBdEpKD26ZawPMy MLqBdr46Q2AV+bkuxlNpEyW6aZ5Q1sDGbpTRprfYMQ5S6o8+/nvV0ivg9jXLK7xcM+Kh FCj3nckQIuHz807IwAJxuVzqeDASOSJrFNUKYaxV3PcnWqrUVPaumofuvhl+SEX0hVZT iPUizBdy5Orut1KvRReQ5cP+noc3YCwtoGj0ANLU6lnftiD1EOzYXVoQg3HnmVJByV0I X1M9KcM6WoE9mpk2TXNx8Ufh+jSmz3fevGvHvf9LGpBiISUBWQJs0beCE8161FjkFiQo UihQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jRoYMCZ7f18EmOTomklG1WV7buq2BDQ67jVm3QabE8I=; b=yEv+TMyO0VIO92uNZMT5rCaT8NMTHMigLuaYAHg+iVLBN+Wrf2j4poum61y4EVYhvf johpzhE1XaLOLwtVUSIin1h/TUoPW+2TfdZ2AHlmlZtWA4YTQwMnD8BUHc5Vmf+jXdx/ BeozIG5uBDSyiNTJAou2asxRX22tIDpbrItM3lr9bvj4DY1CdPh7m1P6SRwkwgG5v5AD nXSX7zVQXb5UoV17gBzi9GQSuaLJA58YoOCBqP1QxLkJGWr/7irUxTZoQPmuKGnINjQG oXUT6jpUeEGK7KGFkrLrmguSYYEj33OdajWv0nu8vTWY2ZvkjCzva+Gtp1zLwGfyZnFj g93w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id 187-v6si11137124qkh.245.2018.06.09.05.34.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Jun 2018 05:34:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C74E2BB43A; Sat, 9 Jun 2018 12:34:40 +0000 (UTC) Received: from localhost (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3805E200BCEB; Sat, 9 Jun 2018 12:34:31 +0000 (UTC) From: Ming Lei To: Jens Axboe , Christoph Hellwig , Alexander Viro , Kent Overstreet Cc: David Sterba , Huang Ying , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Theodore Ts'o , "Darrick J . Wong" , Coly Li , Filipe Manana , Randy Dunlap , Ming Lei Subject: [PATCH V6 21/30] btrfs: conver to bio_for_each_chunk_segment_all Date: Sat, 9 Jun 2018 20:30:05 +0800 Message-Id: <20180609123014.8861-22-ming.lei@redhat.com> In-Reply-To: <20180609123014.8861-1-ming.lei@redhat.com> References: <20180609123014.8861-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sat, 09 Jun 2018 12:34:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sat, 09 Jun 2018 12:34:40 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ming.lei@redhat.com' RCPT:'' X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 --- fs/btrfs/compression.c | 3 ++- fs/btrfs/disk-io.c | 3 ++- fs/btrfs/extent_io.c | 9 ++++++--- fs/btrfs/inode.c | 6 ++++-- fs/btrfs/raid56.c | 3 ++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 02da66acc57d..388804e9dde6 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -166,13 +166,14 @@ static void end_compressed_bio_read(struct bio *bio) } else { int i; struct bio_vec *bvec; + struct bvec_chunk_iter citer; /* * we have verified the checksum already, set page * checked so the end_io handlers know about it */ ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, cb->orig_bio, i) + bio_for_each_chunk_segment_all(bvec, cb->orig_bio, i, citer) SetPageChecked(bvec->bv_page); bio_endio(cb->orig_bio); diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 205092dc9390..e9ad3daa3247 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -829,9 +829,10 @@ static blk_status_t btree_csum_one_bio(struct bio *bio) struct bio_vec *bvec; struct btrfs_root *root; int i, ret = 0; + struct bvec_chunk_iter citer; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { root = BTRFS_I(bvec->bv_page->mapping->host)->root; ret = csum_dirty_buffer(root->fs_info, bvec->bv_page); if (ret) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index efb8db0fd73c..805bac595f3a 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2453,9 +2453,10 @@ static void end_bio_extent_writepage(struct bio *bio) u64 start; u64 end; int i; + struct bvec_chunk_iter citer; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { struct page *page = bvec->bv_page; struct inode *inode = page->mapping->host; struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); @@ -2524,9 +2525,10 @@ static void end_bio_extent_readpage(struct bio *bio) int mirror; int ret; int i; + struct bvec_chunk_iter citer; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { struct page *page = bvec->bv_page; struct inode *inode = page->mapping->host; struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); @@ -3678,9 +3680,10 @@ static void end_bio_extent_buffer_writepage(struct bio *bio) struct bio_vec *bvec; struct extent_buffer *eb; int i, done; + struct bvec_chunk_iter citer; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { struct page *page = bvec->bv_page; eb = (struct extent_buffer *)page->private; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 89b208201783..deee00ca8e6d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7894,6 +7894,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) struct bio_vec *bvec; struct extent_io_tree *io_tree, *failure_tree; int i; + struct bvec_chunk_iter citer; if (bio->bi_status) goto end; @@ -7905,7 +7906,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) done->uptodate = 1; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) + bio_for_each_chunk_segment_all(bvec, bio, i, citer) clean_io_failure(BTRFS_I(inode)->root->fs_info, failure_tree, io_tree, done->start, bvec->bv_page, btrfs_ino(BTRFS_I(inode)), 0); @@ -7984,6 +7985,7 @@ static void btrfs_retry_endio(struct bio *bio) int uptodate; int ret; int i; + struct bvec_chunk_iter citer; if (bio->bi_status) goto end; @@ -7997,7 +7999,7 @@ static void btrfs_retry_endio(struct bio *bio) failure_tree = &BTRFS_I(inode)->io_failure_tree; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { ret = __readpage_endio_check(inode, io_bio, i, bvec->bv_page, bvec->bv_offset, done->start, bvec->bv_len); diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 5e4ad134b9ad..c9f21039e1db 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -1463,10 +1463,11 @@ static void set_bio_pages_uptodate(struct bio *bio) { struct bio_vec *bvec; int i; + struct bvec_chunk_iter citer; ASSERT(!bio_flagged(bio, BIO_CLONED)); - bio_for_each_segment_all(bvec, bio, i) + bio_for_each_chunk_segment_all(bvec, bio, i, citer) SetPageUptodate(bvec->bv_page); }