gfs2: Simplify clean_journal

In function clean_journal(), update @head to point at the log header
that indicates successful recovery:  this is where logging needs to
resume.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index db1238480e91bbe3db588edde502c8a82337dff7..5e37574820b7c8ec70fba49495f514fdc50a437e 100644 (file)
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -264,10 +264,10 @@ static void clean_journal(struct gfs2_jdesc *jd,
                          struct gfs2_log_header_host *head)
 {
        struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
-       u32 lblock = head->lh_blkno;
 
-       gfs2_replay_incr_blk(jd, &lblock);
-       gfs2_write_log_header(sdp, jd, head->lh_sequence + 1, 0, lblock,
+       gfs2_replay_incr_blk(jd, &head->lh_blkno);
+       head->lh_sequence++;
+       gfs2_write_log_header(sdp, jd, head->lh_sequence, 0, head->lh_blkno,
                              GFS2_LOG_HEAD_UNMOUNT | GFS2_LOG_HEAD_RECOVERY,
                              REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC);
 }