Commit 556e0319 authored by Harshad Shirwadkar's avatar Harshad Shirwadkar Committed by Theodore Ts'o
Browse files

ext4: disable fast commit with data journalling 



Fast commits don't work with data journalling. This patch disables the
fast commit support when data journalling is turned on.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20201106035911.1942128-19-harshadshirwadkar@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 1ceecb53

fs/ext4/fast_commit.c

+7 −0
Original line number Diff line number Diff line
@@ -483,6 +483,12 @@ void ext4_fc_track_inode(handle_t *handle, struct inode *inode) 
	if (S_ISDIR(inode->i_mode))

		return;



	if (ext4_should_journal_data(inode)) {

		ext4_fc_mark_ineligible(inode->i_sb,

					EXT4_FC_REASON_INODE_JOURNAL_DATA);

		return;

	}



	ret = ext4_fc_track_template(handle, inode, __track_inode, NULL, 1);

	trace_ext4_fc_track_inode(inode, ret);

}
@@ -2102,6 +2108,7 @@ const char *fc_ineligible_reasons[] = { 
	"Resize",

	"Dir renamed",

	"Falloc range op",

	"Data journalling",

	"FC Commit Failed"

};

fs/ext4/fast_commit.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ enum { 
	EXT4_FC_REASON_RESIZE,

	EXT4_FC_REASON_RENAME_DIR,

	EXT4_FC_REASON_FALLOC_RANGE,

	EXT4_FC_REASON_INODE_JOURNAL_DATA,

	EXT4_FC_COMMIT_FAILED,

	EXT4_FC_REASON_MAX

};

fs/ext4/super.c

+2 −1
Original line number Diff line number Diff line
@@ -4340,9 +4340,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
#endif



	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) {

		printk_once(KERN_WARNING "EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, and O_DIRECT support!\n");

		printk_once(KERN_WARNING "EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, O_DIRECT and fast_commit support!\n");

		/* can't mount with both data=journal and dioread_nolock. */

		clear_opt(sb, DIOREAD_NOLOCK);

		clear_opt2(sb, JOURNAL_FAST_COMMIT);

		if (test_opt2(sb, EXPLICIT_DELALLOC)) {

			ext4_msg(sb, KERN_ERR, "can't mount with "

				 "both data=journal and delalloc");

include/trace/events/ext4.h

+4 −2
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ TRACE_DEFINE_ENUM(ES_REFERENCED_B); 
		{ EXT4_FC_REASON_SWAP_BOOT,	"SWAP_BOOT"},		\

		{ EXT4_FC_REASON_RESIZE,	"RESIZE"},		\

		{ EXT4_FC_REASON_RENAME_DIR,	"RENAME_DIR"},		\

		{ EXT4_FC_REASON_FALLOC_RANGE,	"FALLOC_RANGE"})

		{ EXT4_FC_REASON_FALLOC_RANGE,	"FALLOC_RANGE"},	\

		{ EXT4_FC_REASON_INODE_JOURNAL_DATA,	"INODE_JOURNAL_DATA"})



TRACE_EVENT(ext4_other_inode_update_time,

	TP_PROTO(struct inode *inode, ino_t orig_ino),
@@ -2917,7 +2918,7 @@ TRACE_EVENT(ext4_fc_stats, 
		    ),



	    TP_printk("dev %d:%d fc ineligible reasons:\n"

		      "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; "

		      "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; "

		      "num_commits:%ld, ineligible: %ld, numblks: %ld",

		      MAJOR(__entry->dev), MINOR(__entry->dev),

		      FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR),
@@ -2928,6 +2929,7 @@ TRACE_EVENT(ext4_fc_stats, 
		      FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE),

		      FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR),

		      FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE),

		      FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA),

		      __entry->sbi->s_fc_stats.fc_num_commits,

		      __entry->sbi->s_fc_stats.fc_ineligible_commits,

		      __entry->sbi->s_fc_stats.fc_numblks)