On 6/13/22 16:36, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
>
> The patch below does not apply to the 5.18-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
Hi Greg,
I sent you the fixed backported patch in reply to this email. The same
patch also applies as-is to 5.17, 5.15 and 5.10.
Thanks !
>
> ------------------ original commit in Linus's tree ------------------
>
> From a2a513be7139b279f1b5b2cee59c6c4950c34346 Mon Sep 17 00:00:00 2001
> From: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> Date: Thu, 2 Jun 2022 23:16:57 +0900
> Subject: [PATCH] zonefs: fix handling of explicit_open option on mount
>
> 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@xxxxxxxxxxxxxxx>
> Signed-off-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
>
> diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
> index bcb21aea990a..ecce84909ca1 100644
> --- a/fs/zonefs/super.c
> +++ b/fs/zonefs/super.c
> @@ -1760,12 +1760,6 @@ static int zonefs_fill_super(struct super_block *sb, void *data, int silent)
>
> atomic_set(&sbi->s_wro_seq_files, 0);
> sbi->s_max_wro_seq_files = bdev_max_open_zones(sb->s_bdev);
> - if (!sbi->s_max_wro_seq_files &&
> - 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;
> - }
> -
> atomic_set(&sbi->s_active_seq_files, 0);
> sbi->s_max_active_seq_files = bdev_max_active_zones(sb->s_bdev);
>
> @@ -1790,6 +1784,12 @@ static int zonefs_fill_super(struct super_block *sb, void *data, int silent)
> zonefs_info(sb, "Mounting %u zones",
> blkdev_nr_zones(sb->s_bdev->bd_disk));
>
> + if (!sbi->s_max_wro_seq_files &&
> + 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);
>
--
Damien Le Moal
Western Digital Research
