5.18-stable patches

added patches:
	zonefs-fix-handling-of-explicit_open-option-on-mount.patch

diff --git a/queue-5.18/series b/queue-5.18/series
index a344adf4ab5701c2499e480e9d8093b74617dfc6..a4b3fe3a5965660a22087d879026ed07f8b3c1de 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -336,3 +336,4 @@ random-avoid-checking-crng_ready-twice-in-random_init.patch
 random-mark-bootloader-randomness-code-as-__init.patch
 random-account-for-arch-randomness-in-bits.patch
 md-raid0-ignore-raid0-layout-if-the-second-zone-has-only-one-device.patch
+zonefs-fix-handling-of-explicit_open-option-on-mount.patch

diff --git a/queue-5.18/zonefs-fix-handling-of-explicit_open-option-on-mount.patch b/queue-5.18/zonefs-fix-handling-of-explicit_open-option-on-mount.patch
new file mode 100644 (file)
index 0000000..4da7c06
--- /dev/null
+++ b/queue-5.18/zonefs-fix-handling-of-explicit_open-option-on-mount.patch
@@ -0,0 +1,52 @@
+From a2a513be7139b279f1b5b2cee59c6c4950c34346 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Date: Thu, 2 Jun 2022 23:16:57 +0900
+Subject: zonefs: fix handling of explicit_open option on mount
+
+From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+
+commit a2a513be7139b279f1b5b2cee59c6c4950c34346 upstream.
+
+Ignoring the explicit_open mount option on mount for devices that do not
+have a limit on the number of open zones must be done after the mount
+options are parsed and set in s_mount_opts. Move the check to ignore
+the explicit_open option after the call to zonefs_parse_options() in
+zonefs_fill_super().
+
+Fixes: b5c00e975779 ("zonefs: open/close zone on file open/close")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/zonefs/super.c |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- a/fs/zonefs/super.c
++++ b/fs/zonefs/super.c
+@@ -1690,11 +1690,6 @@ static int zonefs_fill_super(struct supe
+       sbi->s_mount_opts = ZONEFS_MNTOPT_ERRORS_RO;
+       sbi->s_max_open_zones = bdev_max_open_zones(sb->s_bdev);
+       atomic_set(&sbi->s_open_zones, 0);
+-      if (!sbi->s_max_open_zones &&
+-          sbi->s_mount_opts & ZONEFS_MNTOPT_EXPLICIT_OPEN) {
+-              zonefs_info(sb, "No open zones limit. Ignoring explicit_open mount option\n");
+-              sbi->s_mount_opts &= ~ZONEFS_MNTOPT_EXPLICIT_OPEN;
+-      }
+ 
+       ret = zonefs_read_super(sb);
+       if (ret)
+@@ -1713,6 +1708,12 @@ static int zonefs_fill_super(struct supe
+       zonefs_info(sb, "Mounting %u zones",
+                   blkdev_nr_zones(sb->s_bdev->bd_disk));
+ 
++      if (!sbi->s_max_open_zones &&
++          sbi->s_mount_opts & ZONEFS_MNTOPT_EXPLICIT_OPEN) {
++              zonefs_info(sb, "No open zones limit. Ignoring explicit_open mount option\n");
++              sbi->s_mount_opts &= ~ZONEFS_MNTOPT_EXPLICIT_OPEN;
++      }
++
+       /* Create root directory inode */
+       ret = -ENOMEM;
+       inode = new_inode(sb);