lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 218/266] gfs2: Allow lock_nolock mount to specify jid=X
    Date
    From: Bob Peterson <rpeterso@redhat.com>

    [ Upstream commit ea22eee4e6027d8927099de344f7fff43c507ef9 ]

    Before this patch, a simple typo accidentally added \n to the jid=
    string for lock_nolock mounts. This made it impossible to mount a
    gfs2 file system with a journal other than journal0. Thus:

    mount -tgfs2 -o hostdata="jid=1" <device> <mount pt>

    Resulted in:
    mount: wrong fs type, bad option, bad superblock on <device>

    In most cases this is not a problem. However, for debugging and
    testing purposes we sometimes want to test the integrity of other
    journals. This patch removes the unnecessary \n and thus allows
    lock_nolock users to specify an alternate journal.

    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/gfs2/ops_fstype.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
    index 18daf494abab..c26c864590cc 100644
    --- a/fs/gfs2/ops_fstype.c
    +++ b/fs/gfs2/ops_fstype.c
    @@ -911,7 +911,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo)
    }

    static const match_table_t nolock_tokens = {
    - { Opt_jid, "jid=%d\n", },
    + { Opt_jid, "jid=%d", },
    { Opt_err, NULL },
    };

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:27    [W:4.107 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site