From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Qu Wenru <wqu@suse.com>,
Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH v2 5/7] btrfs: remove final BUG_ON() in close_fs_devices()
Date: Wed, 13 Nov 2019 11:27:26 +0100 [thread overview]
Message-ID: <20191113102728.8835-6-jthumshirn@suse.de> (raw)
In-Reply-To: <20191113102728.8835-1-jthumshirn@suse.de>
Now that the preparation work is done, remove the temporary BUG_ON() in
close_fs_devices() and return an error instead.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
Changes to v1:
- btrfs_fs_devices::seeding is a 'boolean' flags and no counter, don't
decrement it (Qu)
---
fs/btrfs/volumes.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index be1fd935edf7..25e4608e20f1 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1128,7 +1128,11 @@ static int close_fs_devices(struct btrfs_fs_devices *fs_devices)
mutex_lock(&fs_devices->device_list_mutex);
list_for_each_entry_safe(device, tmp, &fs_devices->devices, dev_list) {
ret = btrfs_close_one_device(device);
- BUG_ON(ret); /* -ENOMEM */
+ if (ret) {
+ mutex_unlock(&fs_devices->device_list_mutex);
+ return ret;
+ }
+ fs_devices->opened--;
}
mutex_unlock(&fs_devices->device_list_mutex);
--
2.16.4
next prev parent reply other threads:[~2019-11-13 10:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 10:27 [PATCH v2 0/7] remove BUG_ON()s in btrfs_close_one_device() Johannes Thumshirn
2019-11-13 10:27 ` [PATCH v2 1/7] btrfs: decrement number of open devices after closing the device not before Johannes Thumshirn
2019-11-13 10:27 ` [PATCH v2 2/7] btrfs: handle device allocation failure in btrfs_close_one_device() Johannes Thumshirn
2019-11-13 14:58 ` David Sterba
2019-11-14 8:48 ` Johannes Thumshirn
2019-11-14 10:56 ` Anand Jain
2019-11-14 12:03 ` Johannes Thumshirn
2019-11-14 13:02 ` Johannes Thumshirn
2019-11-13 10:27 ` [PATCH v2 3/7] btrfs: handle allocation failure in strdup Johannes Thumshirn
2019-11-14 11:00 ` Anand Jain
2019-11-15 9:39 ` David Sterba
2019-11-15 21:11 ` Nikolay Borisov
2019-11-13 10:27 ` [PATCH v2 4/7] btrfs: handle error return of close_fs_devices() Johannes Thumshirn
2019-11-13 15:00 ` David Sterba
2019-11-14 8:15 ` Johannes Thumshirn
2019-11-13 10:27 ` Johannes Thumshirn [this message]
2019-11-13 15:02 ` [PATCH v2 5/7] btrfs: remove final BUG_ON() in close_fs_devices() David Sterba
2019-11-14 9:01 ` Johannes Thumshirn
2019-11-13 10:27 ` [PATCH v2 6/7] btrfs: change btrfs_fs_devices::seeing to bool Johannes Thumshirn
2019-11-14 11:04 ` Anand Jain
2019-11-13 10:27 ` [PATCH v2 7/7] btrfs: change btrfs_fs_devices::rotating " Johannes Thumshirn
2019-11-14 11:05 ` Anand Jain
2019-11-13 11:56 ` [PATCH v2 0/7] remove BUG_ON()s in btrfs_close_one_device() Qu Wenruo
2019-11-13 15:05 ` David Sterba
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=20191113102728.8835-6-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.com \
/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).