Skip to content

Commit

Permalink
gfs2: Allow lock_nolock mount to specify jid=X
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Andreas Gruenbacher <[email protected]>
  • Loading branch information
AstralBob authored and Andreas Gruenbacher committed Jun 2, 2020
1 parent bbae10f commit ea22eee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/gfs2/ops_fstype.c
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,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 },
};

Expand Down

0 comments on commit ea22eee

Please sign in to comment.