linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2] btrfs: not a disk error if the bio_add_page fails
Date: Wed,  3 Jan 2018 21:52:43 +0800	[thread overview]
Message-ID: <20180103135243.21169-1-anand.jain@oracle.com> (raw)
In-Reply-To: <20180103080729.20804-1-anand.jain@oracle.com>

bio_add_page() can fail for logical reasons as from the bio_add_page()
comments:- 'This will only fail if either
bio->bi_vcnt == bio->bi_max_vecs or it's a cloned bio.' Don't inc the
write error statistics for this. And set -EINVAL instead of -EIO.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v1->v2: Add missing bio_put(). Thanks Filipe.

 fs/btrfs/scrub.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index ecfe3118d9dd..57ac39a3f046 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -4617,15 +4617,16 @@ static int write_page_nocow(struct scrub_ctx *sctx,
 	bio->bi_opf = REQ_OP_WRITE | REQ_SYNC;
 	ret = bio_add_page(bio, page, PAGE_SIZE, 0);
 	if (ret != PAGE_SIZE) {
-leave_with_eio:
+		bio_put(bio);
+		return -EINVAL;
+	}
+
+	if (btrfsic_submit_bio_wait(bio)) {
 		bio_put(bio);
 		btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);
 		return -EIO;
 	}
 
-	if (btrfsic_submit_bio_wait(bio))
-		goto leave_with_eio;
-
 	bio_put(bio);
 	return 0;
 }
-- 
2.15.0


  parent reply	other threads:[~2018-01-03 13:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-03  8:07 [PATCH] btrfs: not a disk error if the bio_add_page fails Anand Jain
2018-01-03 11:34 ` Filipe Manana
2018-01-03 13:53   ` Anand Jain
2018-01-03 13:52 ` Anand Jain [this message]
2018-01-04 17:47   ` [PATCH v2] " Liu Bo
2018-01-04 18:50     ` Liu Bo
2018-01-05  2:25       ` Anand Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180103135243.21169-1-anand.jain@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).