shithub: lwext4

Info  •  Files  •  Log

ext4_journal: fix not wrapping blocks when recovering.

--- a/src/ext4_journal.c

+++ b/src/ext4_journal.c

@@ -96,6 +96,14 @@

 	uint32_t this_trans_id;

 };

+/* Make sure we wrap around the log correctly! */

+#define wrap(sb, var)						\

+do {									\

+	if (var >= jbd_get32((sb), maxlen))					\

+		var -= (jbd_get32((sb), maxlen) - jbd_get32((sb), first));	\

+} while (0)

+

+

 static int

 jbd_revoke_entry_cmp(struct revoke_entry *a, struct revoke_entry *b)

 {

@@ -816,6 +824,7 @@

 	uint32_t *iblock = arg;

 	ext4_dbg(DEBUG_JBD, "Block in block_tag: %" PRIu64 "\n", block);

 	(*iblock)++;

+	wrap(&jbd_fs->sb, *iblock);

 	(void)jbd_fs;

 	(void)uuid;

 	return;

@@ -848,6 +857,7 @@

 	struct ext4_fs *fs = jbd_fs->inode_ref.fs;

 	(*this_block)++;

+	wrap(&jbd_fs->sb, *this_block);

 	/* We replay this block only if the current transaction id

 	 * is equal or greater than that in revoke entry.*/

@@ -940,12 +950,6 @@

 	}

 }

-/* Make sure we wrap around the log correctly! */

-#define wrap(sb, var)						\

-do {									\

-	if (var >= jbd_get32((sb), maxlen))					\

-		var -= (jbd_get32((sb), maxlen) - jbd_get32((sb), first));	\

-} while (0)

 #define ACTION_SCAN 0

 #define ACTION_REVOKE 1