| From 1a2cb324a544850e0f788d90902041e1279fb627 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 29 Apr 2020 08:45:54 -0500 |
| Subject: gfs2: Allow lock_nolock mount to specify jid=X |
| |
| 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 057be88eb1b42..7ed0359ebac61 100644 |
| --- a/fs/gfs2/ops_fstype.c |
| +++ b/fs/gfs2/ops_fstype.c |
| @@ -922,7 +922,7 @@ fail: |
| } |
| |
| static const match_table_t nolock_tokens = { |
| - { Opt_jid, "jid=%d\n", }, |
| + { Opt_jid, "jid=%d", }, |
| { Opt_err, NULL }, |
| }; |
| |
| -- |
| 2.25.1 |
| |
