Skip to contentSkip to conversation

gfs2: clean_journal was setting sd_log_flush_head replaying other journals

PATCH Superseded Bob Peterson 1 participant 1 message Mar 25, 2019 1 message not in the archive GFS2 file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 gfs2: clean_journal was setting sd_log_flush_head replaying other journals

In reply to a message not in the archive

Hi,

Function clean_journal was setting the value of sd_log_flush_head, but that's only a valid thing to do if it is replaying its own journal. If it's replaying another node's journal, that's completely wrong and will lead to multiple problems.

---
 fs/gfs2/recovery.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/gfs2/recovery.c +4 -2
index 7389e445a7a7..0595e3a2bc0a 100644
@@ -264,8 +264,10 @@ static void clean_journal(struct gfs2_jdesc *jd,
 {
 	struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
 
-	sdp->sd_log_flush_head = head->lh_blkno;
-	gfs2_replay_incr_blk(jd, &sdp->sd_log_flush_head);
+	if (jd->jd_jid == sdp->sd_lockstruct.ls_jid) {
+		sdp->sd_log_flush_head = head->lh_blkno;
+		gfs2_replay_incr_blk(jd, &sdp->sd_log_flush_head);
+	}
 	gfs2_write_log_header(sdp, jd, head->lh_sequence + 1, 0,
 			      GFS2_LOG_HEAD_UNMOUNT | GFS2_LOG_HEAD_RECOVERY,
 			      REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC);