From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/4] btrfs: preparatory to make btrfs_rm_dev_replace_srcdev() seed aware
Date: Mon, 11 Aug 2014 17:42:53 +0800 [thread overview]
Message-ID: <1407750176-15853-1-git-send-email-anand.jain@oracle.com> (raw)
There is no logical change in this patch, just a preparatory patch,
so that changes can be easily reasoned.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5f634b6..5fd0132 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1960,19 +1960,23 @@ error_undo:
void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *srcdev)
{
+ struct btrfs_fs_devices *fs_devices;
+
WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex));
+ fs_devices = fs_info->fs_devices;
+
list_del_rcu(&srcdev->dev_list);
list_del_rcu(&srcdev->dev_alloc_list);
- fs_info->fs_devices->num_devices--;
+ fs_devices->num_devices--;
if (srcdev->missing) {
- fs_info->fs_devices->missing_devices--;
- fs_info->fs_devices->rw_devices++;
+ fs_devices->missing_devices--;
+ fs_devices->rw_devices++;
}
if (srcdev->can_discard)
- fs_info->fs_devices->num_can_discard--;
+ fs_devices->num_can_discard--;
if (srcdev->bdev) {
- fs_info->fs_devices->open_devices--;
+ fs_devices->open_devices--;
/*
* zero out the old super if it is not writable
--
2.0.0.153.g79dcccc
next reply other threads:[~2014-08-11 9:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 9:42 Anand Jain [this message]
2014-08-11 9:42 ` [PATCH 2/4] btrfs: replace seed device followed by unmount causes kernel WARNING Anand Jain
2014-08-12 7:27 ` Miao Xie
2014-08-11 9:42 ` [PATCH 3/4] btrfs: fix rw_devices miss match after seed replace Anand Jain
2014-08-12 7:29 ` Miao Xie
2014-08-12 8:00 ` Anand Jain
2014-08-11 9:42 ` [PATCH 4/4] btrfs: update sprout seed pointer when seed fs is relinquished Anand Jain
2014-08-12 7:24 ` Miao Xie
2014-08-12 7:56 ` Anand Jain
2014-08-12 7:30 ` [PATCH 1/4] btrfs: preparatory to make btrfs_rm_dev_replace_srcdev() seed aware Miao Xie
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=1407750176-15853-1-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).