From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/3] btrfs: make code easy to read in btrfs_open_one_device()
Date: Fri, 15 Dec 2017 15:40:14 +0800 [thread overview]
Message-ID: <20171215074016.26461-1-anand.jain@oracle.com> (raw)
No functional change. First set the usual case, writeable then check
for any special config.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5a4c30451c7f..a81574dba124 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -676,14 +676,12 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,
device->generation = btrfs_super_generation(disk_super);
+ set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_SEEDING) {
clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
fs_devices->seeding = 1;
- } else {
- if (bdev_read_only(bdev))
- clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
- else
- set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
+ } else if (bdev_read_only(bdev)) {
+ clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
}
q = bdev_get_queue(bdev);
--
2.7.0
next reply other threads:[~2017-12-15 7:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-15 7:40 Anand Jain [this message]
2017-12-15 7:40 ` [PATCH 2/3] btrfs: optimize move uuid_mutex closer to the critical section Anand Jain
2018-01-05 14:11 ` David Sterba
2017-12-15 7:40 ` [PATCH 3/3] btrfs: misc cleanup btrfs_scan_one_device() Anand Jain
2018-01-05 14:14 ` David Sterba
2018-01-05 14:09 ` [PATCH 1/3] btrfs: make code easy to read in btrfs_open_one_device() David Sterba
2018-01-22 4:11 ` 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=20171215074016.26461-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).