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 9/9] btrfs: add explicit check for replace result no error
Date: Wed,  7 Nov 2018 19:43:30 +0800	[thread overview]
Message-ID: <1541591010-29789-10-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1541591010-29789-1-git-send-email-anand.jain@oracle.com>

We recast the replace return status
BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS to 0, to indicate no
error.
And since BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR should also return 0,
which is also declared as 0, so we just return. Instead add it to the if
statement so that there is enough clarity while reading the code.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/dev-replace.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index cf3554554616..ca44998189c7 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -533,8 +533,9 @@ int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,
 					args->start.cont_reading_from_srcdev_mode);
 	args->result = ret;
 	/* don't warn if EINPROGRESS, someone else might be running scrub */
-	if (ret == BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS)
-		ret = 0;
+	if (ret == BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS ||
+	    ret == BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR)
+		return 0;
 
 	return ret;
 }
-- 
1.8.3.1


  parent reply	other threads:[~2018-11-07 11:43 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-07 11:43 [PATCH 0/9] fix replace-start and replace-cancel racing Anand Jain
2018-11-07 11:43 ` [PATCH 1/9] btrfs: mark btrfs_dev_replace_start() as static Anand Jain
2018-11-07 12:04   ` Nikolay Borisov
2018-11-07 11:43 ` [PATCH 2/9] btrfs: replace go back to suspended if target missing Anand Jain
2018-11-07 12:35   ` Nikolay Borisov
2018-11-11 14:00     ` Anand Jain
2018-11-07 11:43 ` [PATCH 3/9] btrfs: replace back to suspend state if EXCL OP is running Anand Jain
2018-11-07 11:43 ` [PATCH 4/9] btrfs: fix UAF due to race between replace start and cancel Anand Jain
2018-11-07 11:43 ` [PATCH 5/9] btrfs: replace cancel is successful if scrub cancel is successful Anand Jain
2018-11-07 12:25   ` Nikolay Borisov
2018-11-07 12:26     ` Nikolay Borisov
2018-11-07 11:43 ` [PATCH 6/9] btrfs: replace's scrub must not be running in replace suspended state Anand Jain
2018-11-07 12:19   ` Nikolay Borisov
2018-11-08  8:33     ` Anand Jain
2018-11-08  8:52       ` Nikolay Borisov
2018-11-08  9:07         ` Anand Jain
2018-11-07 11:43 ` [PATCH 7/9] btrfs: quiten warn if the replace is canceled at finish Anand Jain
2018-11-07 12:17   ` Nikolay Borisov
2018-11-08  8:06     ` Anand Jain
2018-11-07 11:43 ` [PATCH 8/9] btrfs: user requsted replace cancel is not an error Anand Jain
2018-11-07 11:43 ` Anand Jain [this message]
2018-11-07 12:15   ` [PATCH 9/9] btrfs: add explicit check for replace result no error Nikolay Borisov
2018-11-08  7:26     ` Anand Jain
  -- strict thread matches above, loose matches on Subject: below --
2018-11-11 14:22 [PATCH 0/9 v2] fix replace-start and replace-cancel racing Anand Jain
2018-11-11 14:22 ` [PATCH 9/9] btrfs: add explicit check for replace result no error 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=1541591010-29789-10-git-send-email-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).