jbd2: Fix statistics for the number of logged blocks (015c6033) · Commits · 戴 / test

jbd2 statistics counting number of blocks logged in a transaction was wrong. It didn't count the commit block and more importantly it didn't count revoke descriptor blocks. Make sure these get properly counted. Reviewed-by:

Theodore Ts'o <tytso@mit.edu> Signed-off-by:

Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20191105164437.32602-13-jack@suse.cz Signed-off-by:

Theodore Ts'o <tytso@mit.edu>

fs/jbd2/commit.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -726,7 +726,6 @@ start_journal_io:
		submit_bh(REQ_OP_WRITE, REQ_SYNC, bh);
		}
		cond_resched();
		stats.run.rs_blocks_logged += bufs;

		/* Force a new descriptor to be generated next
		time round the loop. */
		@@ -813,6 +812,7 @@ start_journal_io:
		if (unlikely(!buffer_uptodate(bh)))
		err = -EIO;
		jbd2_unfile_log_bh(bh);
		stats.run.rs_blocks_logged++;

		/*
		* The list contains temporary buffer heads created by
		@@ -858,6 +858,7 @@ start_journal_io:
		BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile");
		clear_buffer_jwrite(bh);
		jbd2_unfile_log_bh(bh);
		stats.run.rs_blocks_logged++;
		__brelse(bh); /* One for getblk */
		/* AKPM: bforget here */
		}
		@@ -879,6 +880,7 @@ start_journal_io:
		}
		if (cbh)
		err = journal_wait_on_commit_record(journal, cbh);
		stats.run.rs_blocks_logged++;
		if (jbd2_has_feature_async_commit(journal) &&
		journal->j_flags & JBD2_BARRIER) {
		blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL);

Admin message