From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 3/9] btrfs: localise has_metadata_uuid check in alloc_fs_devices args
Date: Tue, 23 May 2023 18:03:17 +0800 [thread overview]
Message-ID: <346ccfd4aefd8077db8c0c908c53718ee5090b63.1684826247.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1684826246.git.anand.jain@oracle.com>
Simplify %has_metadata_uuid checks - by localizing the
%has_metadata_uuid checked within alloc_fs_devices()'s second argument,
it improves the code readability.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 6f231e679667..95b87e9a0a73 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -791,12 +791,9 @@ static noinline struct btrfs_device *device_list_add(const char *path,
if (!fs_devices) {
- if (has_metadata_uuid)
- fs_devices = alloc_fs_devices(disk_super->fsid,
- disk_super->metadata_uuid);
- else
- fs_devices = alloc_fs_devices(disk_super->fsid, NULL);
-
+ fs_devices = alloc_fs_devices(disk_super->fsid,
+ has_metadata_uuid ?
+ disk_super->metadata_uuid : NULL);
if (IS_ERR(fs_devices))
return ERR_CAST(fs_devices);
--
2.39.2
next prev parent reply other threads:[~2023-05-23 10:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 10:03 [PATCH 0/9] btrfs: metadata_uuid refactors part1 Anand Jain
2023-05-23 10:03 ` [PATCH 1/9] btrfs: reduce struct btrfs_fs_devices size relocate fsid_change Anand Jain
2023-05-23 16:27 ` Christoph Hellwig
2023-05-23 20:59 ` David Sterba
2023-05-24 5:56 ` Christoph Hellwig
2023-05-24 11:00 ` Anand Jain
2023-05-23 21:31 ` David Sterba
2023-05-24 5:15 ` Anand Jain
2023-05-23 10:03 ` [PATCH 2/9] btrfs: streamline fsid checks in alloc_fs_devices Anand Jain
2023-05-23 16:30 ` Christoph Hellwig
2023-05-24 8:45 ` Anand Jain
2023-05-23 10:03 ` Anand Jain [this message]
2023-05-23 10:03 ` [PATCH 4/9] btrfs: add comment about metadata_uuid in btrfs_fs_devices Anand Jain
2023-05-23 10:03 ` [PATCH 5/9] btrfs: simplify check_tree_block_fsid return arg to bool Anand Jain
2023-05-23 10:03 ` [PATCH 6/9] btrfs: refactor with memcmp_fsid_fs_devices helper Anand Jain
2023-05-23 21:23 ` David Sterba
2023-05-24 5:55 ` Anand Jain
2023-05-23 10:03 ` [PATCH 7/9] btrfs: refactor with memcmp_fsid_changed helper Anand Jain
2023-05-23 16:31 ` Christoph Hellwig
2023-05-23 10:03 ` [PATCH 8/9] btrfs: consolidate uuid memcmp in btrfs_validate_super Anand Jain
2023-05-23 10:03 ` [PATCH 9/9] btrfs: fix source code style in find_fsid Anand Jain
2023-05-23 21:29 ` David Sterba
2023-05-24 5:57 ` Anand Jain
2023-05-23 21:33 ` [PATCH 0/9] btrfs: metadata_uuid refactors part1 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=346ccfd4aefd8077db8c0c908c53718ee5090b63.1684826247.git.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.