Commit 6866d7b3 authored by Harshad Shirwadkar's avatar Harshad Shirwadkar Committed by Theodore Ts'o
Browse files

ext4 / jbd2: add fast commit initialization 



This patch adds fast commit area trackers in the journal_t
structure. These are initialized via the jbd2_fc_init() routine that
this patch adds. This patch also adds ext4/fast_commit.c and
ext4/fast_commit.h files for fast commit code that will be added in
subsequent patches in this series.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Link: https://lore.kernel.org/r/20201015203802.3597742-4-harshadshirwadkar@gmail.com


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

fs/ext4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ext4-y := balloc.o bitmap.o block_validity.o dir.o ext4_jbd2.o extents.o \ 
		indirect.o inline.o inode.o ioctl.o mballoc.o migrate.o \

		mmp.o move_extent.o namei.o page-io.o readpage.o resize.o \

		super.o symlink.o sysfs.o xattr.o xattr_hurd.o xattr_trusted.o \

		xattr_user.o

		xattr_user.o fast_commit.o



ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_SECURITY)		+= xattr_security.o

fs/ext4/ext4.h

+4 −0
Original line number Diff line number Diff line
@@ -963,6 +963,7 @@ do { \ 
#endif /* defined(__KERNEL__) || defined(__linux__) */



#include "extents_status.h"

#include "fast_commit.h"



/*

 * Lock subclasses for i_data_sem in the ext4_inode_info structure.
@@ -2678,6 +2679,9 @@ extern int ext4_init_inode_table(struct super_block *sb, 
				 ext4_group_t group, int barrier);

extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);



/* fast_commit.c */



void ext4_fc_init(struct super_block *sb, journal_t *journal);

/* mballoc.c */

extern const struct seq_operations ext4_mb_seq_groups_ops;

extern long ext4_mb_stats;

fs/ext4/fast_commit.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/*

 * fs/ext4/fast_commit.c

 *

 * Written by Harshad Shirwadkar <harshadshirwadkar@gmail.com>

 *

 * Ext4 fast commits routines.

 */

#include "ext4_jbd2.h"



void ext4_fc_init(struct super_block *sb, journal_t *journal)

{

	if (!test_opt2(sb, JOURNAL_FAST_COMMIT))

		return;

	if (jbd2_fc_init(journal, EXT4_NUM_FC_BLKS)) {

		pr_warn("Error while enabling fast commits, turning off.");

		ext4_clear_feature_fast_commit(sb);

	}

}

fs/ext4/fast_commit.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __FAST_COMMIT_H__

#define __FAST_COMMIT_H__



/* Number of blocks in journal area to allocate for fast commits */

#define EXT4_NUM_FC_BLKS		256



#endif /* __FAST_COMMIT_H__ */

fs/ext4/super.c

+1 −0
Original line number Diff line number Diff line
@@ -5170,6 +5170,7 @@ static void ext4_init_journal_params(struct super_block *sb, journal_t *journal) 
	journal->j_commit_interval = sbi->s_commit_interval;

	journal->j_min_batch_time = sbi->s_min_batch_time;

	journal->j_max_batch_time = sbi->s_max_batch_time;

	ext4_fc_init(sb, journal);



	write_lock(&journal->j_state_lock);

	if (test_opt(sb, BARRIER))

CRA Git | Maintained and supported by SUSTech CRA and CCSE