From: Naohiro Aota <naohiro.aota@wdc.com>
To: linux-btrfs@vger.kernel.org, dsterba@suse.com
Cc: hare@suse.com, linux-fsdevel@vger.kernel.org,
Jens Axboe <axboe@kernel.dk>,
Christoph Hellwig <hch@infradead.org>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v12 06/41] btrfs: do not load fs_info->zoned from incompat flag
Date: Fri, 15 Jan 2021 15:53:09 +0900 [thread overview]
Message-ID: <e9726ecb20d2bc5213e57a7d9456bb77def68333.1610693037.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <cover.1610693036.git.naohiro.aota@wdc.com>
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Don't set the zoned flag in fs_info when encountering the
BTRFS_FEATURE_INCOMPAT_ZONED on mount. The zoned flag in fs_info is in a
union together with the zone_size, so setting it too early will result in
setting an incorrect zone_size as well.
Once the correct zone_size is read from the device, we can rely on the
zoned flag in fs_info as well to determine if the filesystem is running in
zoned mode.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/disk-io.c | 2 --
fs/btrfs/zoned.c | 8 ++++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index e7b451d30ae2..192e366f8afc 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3136,8 +3136,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)
btrfs_info(fs_info, "has skinny extents");
- fs_info->zoned = (features & BTRFS_FEATURE_INCOMPAT_ZONED);
-
/*
* flag our filesystem as having big metadata blocks if
* they are bigger than the page size
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 49148e7a44b4..684dad749a8c 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -431,6 +431,14 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
fs_info->zone_size = zone_size;
fs_info->max_zone_append_size = max_zone_append_size;
+ /*
+ * Check mount options here, because we might change fs_info->zoned
+ * from fs_info->zone_size.
+ */
+ ret = btrfs_check_mountopts_zoned(fs_info);
+ if (ret)
+ goto out;
+
btrfs_info(fs_info, "zoned mode enabled with zone size %llu", zone_size);
out:
return ret;
--
2.27.0
next prev parent reply other threads:[~2021-01-15 6:57 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 6:53 [PATCH v12 00/41] btrfs: zoned block device support Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 01/41] block: add bio_add_zone_append_page Naohiro Aota
2021-01-15 22:03 ` Josef Bacik
2021-01-20 13:34 ` Johannes Thumshirn
2021-01-15 6:53 ` [PATCH v12 02/41] iomap: support REQ_OP_ZONE_APPEND Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 03/41] btrfs: defer loading zone info after opening trees Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 04/41] btrfs: use regular SB location on emulated zoned mode Naohiro Aota
2021-01-15 22:20 ` Josef Bacik
2021-01-15 6:53 ` [PATCH v12 05/41] btrfs: release path before calling into btrfs_load_block_group_zone_info Naohiro Aota
2021-01-15 22:22 ` Josef Bacik
2021-01-18 8:55 ` Johannes Thumshirn
2021-01-15 6:53 ` Naohiro Aota [this message]
2021-01-15 6:53 ` [PATCH v12 07/41] btrfs: disallow fitrim in ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 08/41] btrfs: allow zoned mode on non-zoned block devices Naohiro Aota
2021-01-15 22:07 ` Josef Bacik
2021-01-18 14:15 ` Naohiro Aota
2021-01-19 0:28 ` Anand Jain
2021-01-15 6:53 ` [PATCH v12 08/41] btrfs: emulated zoned mode on non-zoned devices Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 09/41] btrfs: implement zoned chunk allocator Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 10/41] btrfs: verify device extent is aligned to zone Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 11/41] btrfs: load zone's allocation offset Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 12/41] btrfs: calculate allocation offset for conventional zones Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 13/41] btrfs: track unusable bytes for zones Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 14/41] btrfs: do sequential extent allocation in ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 15/41] btrfs: redirty released extent buffers " Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 16/41] btrfs: advance allocation pointer after tree log node Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 17/41] btrfs: enable to mount ZONED incompat flag Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 18/41] btrfs: reset zones of unused block groups Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 19/41] btrfs: extract page adding function Naohiro Aota
2021-01-15 22:14 ` Josef Bacik
2021-01-15 6:53 ` [PATCH v12 20/41] btrfs: use bio_add_zone_append_page for zoned btrfs Naohiro Aota
2021-01-15 22:16 ` Josef Bacik
2021-01-15 6:53 ` [PATCH v12 21/41] btrfs: handle REQ_OP_ZONE_APPEND as writing Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 22/41] btrfs: split ordered extent when bio is sent Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 23/41] btrfs: extend btrfs_rmap_block for specifying a device Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 24/41] btrfs: cache if block-group is on a sequential zone Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 25/41] btrfs: save irq flags when looking up an ordered extent Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 26/41] btrfs: use ZONE_APPEND write for ZONED btrfs Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 27/41] btrfs: enable zone append writing for direct IO Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 28/41] btrfs: introduce dedicated data write path for ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 29/41] btrfs: serialize meta IOs on " Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 30/41] btrfs: wait existing extents before truncating Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 31/41] btrfs: avoid async metadata checksum on ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 32/41] btrfs: mark block groups to copy for device-replace Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 33/41] btrfs: implement cloning for ZONED device-replace Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 34/41] btrfs: implement copying " Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 35/41] btrfs: support dev-replace in ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 36/41] btrfs: enable relocation " Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 37/41] btrfs: relocate block group to repair IO failure in ZONED Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 38/41] btrfs: split alloc_log_tree() Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 39/41] btrfs: extend zoned allocator to use dedicated tree-log block group Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 40/41] btrfs: serialize log transaction on ZONED mode Naohiro Aota
2021-01-15 6:53 ` [PATCH v12 41/41] btrfs: reorder log node allocation Naohiro Aota
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=e9726ecb20d2bc5213e57a7d9456bb77def68333.1610693037.git.naohiro.aota@wdc.com \
--to=naohiro.aota@wdc.com \
--cc=axboe@kernel.dk \
--cc=darrick.wong@oracle.com \
--cc=dsterba@suse.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@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).