lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 298/298] zonefs: fix handling of explicit_open option on mount
    Date
    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);

    \
     
     \ /
      Last update: 2022-06-13 16:52    [W:4.049 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site