diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-08-23 13:06:55 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-08-23 13:06:55 +0200 |
| commit | 3fb5a6562adef115d8a8c3e19cc9d5fae32e93c8 (patch) | |
| tree | 7a0cc61be2ba75aab26403f330da3140424b6b76 /drivers/nvme/host/zns.c | |
| parent | 051178c366bbc1bf8b4aba5ca5519d7da453c95f (diff) | |
| parent | 59ba4fdd2d1f9dd7af98f5168c846150c9aec56d (diff) | |
Merge tag 'vfs-6.6-merge-2' of ssh://gitolite.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull filesystem freezing updates from Darrick Wong:
New code for 6.6:
* Allow the kernel to initiate a freeze of a filesystem. The kernel
and userspace can both hold a freeze on a filesystem at the same
time; the freeze is not lifted until /both/ holders lift it. This
will enable us to fix a longstanding bug in XFS online fsck.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Message-Id: <20230822182604.GB11286@frogsfrogsfrogs>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'drivers/nvme/host/zns.c')
| -rw-r--r-- | drivers/nvme/host/zns.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 12316ab51bda..ec8557810c21 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -10,12 +10,11 @@ int nvme_revalidate_zones(struct nvme_ns *ns) { struct request_queue *q = ns->queue; - int ret; - ret = blk_revalidate_disk_zones(ns->disk, NULL); - if (!ret) - blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append); - return ret; + blk_queue_chunk_sectors(q, ns->zsze); + blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append); + + return blk_revalidate_disk_zones(ns->disk, NULL); } static int nvme_set_max_append(struct nvme_ctrl *ctrl) |