From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 4/4 V3] btrfs: cleanup barrier_all_devices() to check dev stat flush error
Date: Wed, 5 Apr 2017 12:07:23 +0800 [thread overview]
Message-ID: <20170405040723.21579-1-anand.jain@oracle.com> (raw)
In-Reply-To: <20170313074214.24123-5-anand.jain@oracle.com>
The objective of this patch is to cleanup barrier_all_devices()
so that the error checking is in a separate loop independent of
of the loop which submits and waits on the device flush requests.
By doing this it helps to further develop patches which would tune
the error-actions as needed.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: Address Qu review comments viz..
Add meaningful names, like cp_list (for checkpoint_list head).
(And actually it does not need a new struct type just to hold
the head pointer, list node is already named as device_checkpoint).
Check return value of add_device_checkpoint()
Check if the device is already added at add_device_checkpoint()
Rename fini_devices_checkpoint() to rel_devices_checkpoint()
v3:
(resent with the correct version of the patch).
Now the flush error return is saved and checked instead of the
checkpoint of the dev_stat method earlier.
fs/btrfs/disk-io.c | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 420753d37e1a..3c476b118440 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3538,6 +3538,23 @@ static int write_dev_flush(struct btrfs_device *device, int wait)
return 0;
}
+static int check_barrier_error(struct btrfs_fs_devices *fsdevs)
+{
+ int dropouts = 0;
+ struct btrfs_device *dev;
+
+ list_for_each_entry_rcu(dev, &fsdevs->devices, dev_list) {
+ if (!dev->bdev || dev->last_flush_error)
+ dropouts++;
+ }
+
+ if (dropouts >
+ fsdevs->fs_info->num_tolerated_disk_barrier_failures)
+ return -EIO;
+
+ return 0;
+}
+
/*
* send an empty flush down to each device in parallel,
* then wait for them
@@ -3575,8 +3592,19 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
if (write_dev_flush(dev, 1))
dropouts++;
}
- if (dropouts > info->num_tolerated_disk_barrier_failures)
- return -EIO;
+
+ /*
+ * A slight optimization, we check for dropouts here which avoids
+ * a dev list loop when disks are healthy.
+ */
+ if (dropouts) {
+ /*
+ * As we need holistic view of the failed disks, so
+ * error checking is pushed to a separate loop.
+ */
+ return check_barrier_error(info->fs_devices);
+ }
+
return 0;
}
--
2.10.0
prev parent reply other threads:[~2017-04-05 4:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 7:42 [PATCH 0/4] cleanup barrier_all_devices() Anand Jain
2017-03-13 7:42 ` [PATCH 1/4] btrfs: REQ_PREFLUSH does not use btrfs_end_bio() completion callback Anand Jain
2017-03-28 15:19 ` David Sterba
2017-03-29 10:00 ` Anand Jain
2017-03-30 10:57 ` Anand Jain
2017-03-13 7:42 ` [PATCH 2/4] btrfs: Communicate back ENOMEM when it occurs Anand Jain
2017-03-14 8:49 ` Qu Wenruo
2017-03-28 15:38 ` David Sterba
2017-03-29 10:00 ` Anand Jain
2017-03-13 7:42 ` [PATCH 3/4] btrfs: cleanup barrier_all_devices() unify dev error count Anand Jain
2017-03-14 8:53 ` Qu Wenruo
2017-03-13 7:42 ` [PATCH 4/4] btrfs: cleanup barrier_all_devices() to check dev stat flush error Anand Jain
2017-03-13 9:05 ` Qu Wenruo
2017-03-13 16:21 ` Anand Jain
2017-03-14 0:28 ` Qu Wenruo
2017-03-14 3:36 ` Anand Jain
2017-03-14 8:26 ` [PATCH V2 " Anand Jain
2017-03-14 8:47 ` Qu Wenruo
2017-03-28 16:19 ` David Sterba
2017-03-29 10:00 ` Anand Jain
2017-03-31 11:36 ` [PATCH 4/4 V2] " Anand Jain
2017-04-05 4:07 ` Anand Jain [this message]
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=20170405040723.21579-1-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.cz \
--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).