Commit 8016cf87 authored by Bob Peterson's avatar Bob Peterson Committed by Kelsey Skunberg

gfs2: Allow lock_nolock mount to specify jid=X

BugLink: https://bugs.launchpad.net/bugs/1885932

[ Upstream commit ea22eee4 ]

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: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 57976ba9
...@@ -916,7 +916,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) ...@@ -916,7 +916,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo)
} }
static const match_table_t nolock_tokens = { static const match_table_t nolock_tokens = {
{ Opt_jid, "jid=%d\n", }, { Opt_jid, "jid=%d", },
{ Opt_err, NULL }, { Opt_err, NULL },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment