[Debian-ha-commits] [ocfs2-tools] 33/58: fsck.ocfs2: fix journal tail wrapper

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch upstream
in repository ocfs2-tools.

commit 9fa4aa1b141e65c046ccf088b2997a31a8949c3a
Author: Junxiao Bi <junxiao.bi at oracle.com>
Date:   Fri May 22 21:33:06 2015 +0800

    fsck.ocfs2: fix journal tail wrapper
    
    If there is one transaction, its last block but one located at the
    tail of the journal and its last commit block located at the head
    of the journal, Crash the kernel and when fsck.ocfs2 -a run during
    the reboot, the journal replay will fail due to the wrapper error.
    This will make all the following transaction starting from the journal
    head lost, and this will corrupt the fs.
    
    Acked-by: Srinivas Eeda <srinivas.eeda at oracle.com>
    Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
 fsck.ocfs2/journal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fsck.ocfs2/journal.c b/fsck.ocfs2/journal.c
index d0efc8b..95262d3 100644
--- a/fsck.ocfs2/journal.c
+++ b/fsck.ocfs2/journal.c
@@ -339,6 +339,7 @@ static errcode_t replay_blocks(ocfs2_filesys *fs, struct journal_info *ji,
 			tagp += 16;
 	}
 	
+	*next_block = jwrap(ji->ji_jsb, *next_block);
 out:
 	if (io_buf)
 		ocfs2_free(&io_buf);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git