From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 13 Jun 2022 09:46:51 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.9.318~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a84a920c8eed9a47cf92f8fca9738c96f71b8137;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

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

diff --git a/queue-5.15/series b/queue-5.15/series
index 32ac0040839..52908e781b0 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -244,3 +244,4 @@ random-account-for-arch-randomness-in-bits.patch
 md-raid0-ignore-raid0-layout-if-the-second-zone-has-only-one-device.patch
 net-sched-act_police-more-accurate-mtu-policing.patch
 pci-qcom-fix-pipe-clock-imbalance.patch
+zonefs-fix-handling-of-explicit_open-option-on-mount.patch
diff --git a/queue-5.15/zonefs-fix-handling-of-explicit_open-option-on-mount.patch b/queue-5.15/zonefs-fix-handling-of-explicit_open-option-on-mount.patch
new file mode 100644
index 00000000000..463e9e71a77
--- /dev/null
+++ b/queue-5.15/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
+@@ -1694,11 +1694,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)
+@@ -1717,6 +1712,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);