Skip to content

Commit

Permalink
gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0
Browse files Browse the repository at this point in the history
When the first log header in a journal happens to have a sequence
number of 0, a bug in gfs2_find_jhead() causes it to prematurely exit,
and return an uninitialized jhead with seq 0. This can cause failures
in the caller. For instance, a mount fails in one test case.

The correct behavior is for it to continue searching through the journal
to find the correct journal head with the highest sequence number.

Fixes: f4686c2 ("gfs2: read journal in large chunks")
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: Abhi Das <adas@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
  • Loading branch information
Abhi Das authored and Andreas Gruenbacher committed Feb 6, 2020
1 parent a62aa6f commit 7582026
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/gfs2/lops.c
Original file line number Diff line number Diff line change
@@ -422,7 +422,7 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,

for (offset = 0; offset < PAGE_SIZE; offset += sdp->sd_sb.sb_bsize) {
if (!__get_log_header(sdp, kaddr + offset, 0, &lh)) {
if (lh.lh_sequence > head->lh_sequence)
if (lh.lh_sequence >= head->lh_sequence)
*head = lh;
else {
ret = true;

0 comments on commit 7582026

Please sign in to comment.