xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfs2: Fix glock recursion in freeze_go_xmote_bh

Browse Source 
[ Upstream commit 9d9b16054b7d357afde69a027514c695092b0d22 ]

We must not call gfs2_consist (which does a file system withdraw) from
the freeze glock's freeze_go_xmote_bh function because the withdraw
will try to use the freeze glock, thus causing a glock recursion error.

This patch changes freeze_go_xmote_bh to call function
gfs2_assert_withdraw_delayed instead of gfs2_consist to avoid recursion.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bob Peterson
2021-06-01 09:41:40 -05:00
committed by Greg Kroah-Hartman
parent 4e014ff22e
commit 783be2a942
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/gfs2/glops.c
View File

@@ -623,16 +623,13 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl, struct gfs2_holder *gh)
j_gl->gl_ops->go_inval(j_gl, DIO_METADATA); j_gl->gl_ops->go_inval(j_gl, DIO_METADATA);
error = gfs2_find_jhead(sdp->sd_jdesc, &head, false); error = gfs2_find_jhead(sdp->sd_jdesc, &head, false);
if (error) if (gfs2_assert_withdraw_delayed(sdp, !error))
gfs2_consist(sdp); return error;
if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT)) if (gfs2_assert_withdraw_delayed(sdp, head.lh_flags &
gfs2_consist(sdp); GFS2_LOG_HEAD_UNMOUNT))
return -EIO;
/* Initialize some head of the log stuff */ sdp->sd_log_sequence = head.lh_sequence + 1;
if (!gfs2_withdrawn(sdp)) { gfs2_log_pointers_init(sdp, head.lh_blkno);
sdp->sd_log_sequence = head.lh_sequence + 1;
gfs2_log_pointers_init(sdp, head.lh_blkno);
}
} }
return 0; return 0;
} }