Commit 91808cd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 fixes and cleanups from Ted Ts'o:
 "More fixes and cleanups for the new fast_commit features, but also a
  few other miscellaneous bug fixes and a cleanup for the MAINTAINERS
  file"

* tag 'ext4_for_linus_cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (28 commits)
  jbd2: fix up sparse warnings in checkpoint code
  ext4: fix sparse warnings in fast_commit code
  ext4: cleanup fast commit mount options
  jbd2: don't start fast commit on aborted journal
  ext4: make s_mount_flags modifications atomic
  ext4: issue fsdev cache flush before starting fast commit
  ext4: disable fast commit with data journalling
  ext4: fix inode dirty check in case of fast commits
  ext4: remove unnecessary fast commit calls from ext4_file_mmap
  ext4: mark buf dirty before submitting fast commit buffer
  ext4: fix code documentatioon
  ext4: dedpulicate the code to wait on inode that's being committed
  jbd2: don't read journal->j_commit_sequence without taking a lock
  jbd2: don't touch buffer state until it is filled
  jbd2: add todo for a fast commit performance optimization
  jbd2: don't pass tid to jbd2_fc_end_commit_fallback()
  jbd2: don't use state lock during commit path
  jbd2: drop jbd2_fc_init documentation
  ext4: clean up the JBD2 API that initializes fast commits
  jbd2: rename j_maxlen to j_total_len and add jbd2_journal_max_txn_bufs
  ...
parents df3319a5 05d5233d

Documentation/filesystems/ext4/journal.rst

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ which is 1024 bytes long: 
     - s\_padding2

     -

   * - 0x54

     - \_\_be32

     - s\_num\_fc\_blocks

     - Number of fast commit blocks in the journal.

   * - 0x58

     - \_\_u32

     - s\_padding[42]

     -
@@ -310,6 +314,8 @@ The journal incompat features are any combination of the following: 
     - This journal uses v3 of the checksum on-disk format. This is the same as

       v2, but the journal block tag size is fixed regardless of the size of

       block numbers. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3)

   * - 0x20

     - Journal has fast commit blocks. (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT)



.. _jbd2_checksum_type:

Documentation/filesystems/ext4/super.rst

+7 −0
Original line number Diff line number Diff line
@@ -596,6 +596,13 @@ following: 
     - Sparse Super Block, v2. If this flag is set, the SB field s\_backup\_bgs

       points to the two block groups that contain backup superblocks

       (COMPAT\_SPARSE\_SUPER2).

   * - 0x400

     - Fast commits supported. Although fast commits blocks are

       backward incompatible, fast commit blocks are not always

       present in the journal. If fast commit blocks are present in

       the journal, JBD2 incompat feature

       (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT) gets

       set (COMPAT\_FAST\_COMMIT).



.. _super_incompat:

Documentation/filesystems/journalling.rst

+2 −4
Original line number Diff line number Diff line
@@ -136,10 +136,8 @@ Fast commits 
~~~~~~~~~~~~



JBD2 to also allows you to perform file-system specific delta commits known as

fast commits. In order to use fast commits, you first need to call

:c:func:`jbd2_fc_init` and tell how many blocks at the end of journal

area should be reserved for fast commits. Along with that, you will also need

to set following callbacks that perform correspodning work:

fast commits. In order to use fast commits, you will need to set following

callbacks that perform correspodning work:



`journal->j_fc_cleanup_cb`: Cleanup function called after every full commit and

fast commit.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6614,6 +6614,7 @@ Q: http://patchwork.ozlabs.org/project/linux-ext4/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git

F:	Documentation/filesystems/ext4/

F:	fs/ext4/

F:	include/trace/events/ext4.h









Extended Verification Module (EVM)









M:	Mimi Zohar <zohar@linux.ibm.com>
































fs/ext4/ext4.h



+46
−20






























Original line number
Diff line number
Diff line







@@ -1028,9 +1028,6 @@ struct ext4_inode_info {







					 * protected by sbi->s_fc_lock.









					 */



















	/* Fast commit subtid when this inode was committed */









	unsigned int i_fc_committed_subtid;



















	/* Start of lblk range that needs to be committed in this fast commit */









	ext4_lblk_t i_fc_lblk_start;


















@@ -1422,16 +1419,6 @@ struct ext4_super_block {

















#ifdef __KERNEL__



















/*









 * run-time mount flags









 */









#define EXT4_MF_MNTDIR_SAMPLED		0x0001









#define EXT4_MF_FS_ABORTED		0x0002	/* Fatal error detected */









#define EXT4_MF_FC_INELIGIBLE		0x0004	/* Fast commit ineligible */









#define EXT4_MF_FC_COMMITTING		0x0008	/* File system underoing a fast









						 * commit.









						 */



















#ifdef CONFIG_FS_ENCRYPTION









#define DUMMY_ENCRYPTION_ENABLED(sbi) ((sbi)->s_dummy_enc_policy.policy != NULL)









#else








@@ -1466,7 +1453,7 @@ struct ext4_sb_info {







	struct buffer_head * __rcu *s_group_desc;









	unsigned int s_mount_opt;









	unsigned int s_mount_opt2;









	unsigned int s_mount_flags;









	unsigned long s_mount_flags;









	unsigned int s_def_mount_opt;









	ext4_fsblk_t s_sb_block;









	atomic64_t s_resv_clusters;








@@ -1694,6 +1681,34 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)







	_v;								   \









})



















/*









 * run-time mount flags









 */









enum {









	EXT4_MF_MNTDIR_SAMPLED,









	EXT4_MF_FS_ABORTED,	/* Fatal error detected */









	EXT4_MF_FC_INELIGIBLE,	/* Fast commit ineligible */









	EXT4_MF_FC_COMMITTING	/* File system underoing a fast









				 * commit.









				 */









};



















static inline void ext4_set_mount_flag(struct super_block *sb, int bit)









{









	set_bit(bit, &EXT4_SB(sb)->s_mount_flags);









}



















static inline void ext4_clear_mount_flag(struct super_block *sb, int bit)









{









	clear_bit(bit, &EXT4_SB(sb)->s_mount_flags);









}



















static inline int ext4_test_mount_flag(struct super_block *sb, int bit)









{









	return test_bit(bit, &EXT4_SB(sb)->s_mount_flags);









}





























/*









 * Simulate_fail codes









 */








@@ -1863,6 +1878,13 @@ static inline bool ext4_verity_in_progress(struct inode *inode)







#define EXT4_FEATURE_COMPAT_RESIZE_INODE	0x0010









#define EXT4_FEATURE_COMPAT_DIR_INDEX		0x0020









#define EXT4_FEATURE_COMPAT_SPARSE_SUPER2	0x0200









/*









 * The reason why "FAST_COMMIT" is a compat feature is that, FS becomes









 * incompatible only if fast commit blocks are present in the FS. Since we









 * clear the journal (and thus the fast commit blocks), we don't mark FS as









 * incompatible. We also have a JBD2 incompat feature, which gets set when









 * there are fast commit blocks present in the journal.









 */









#define EXT4_FEATURE_COMPAT_FAST_COMMIT		0x0400









#define EXT4_FEATURE_COMPAT_STABLE_INODES	0x0800


















@@ -2731,12 +2753,16 @@ extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);







int ext4_fc_info_show(struct seq_file *seq, void *v);









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









void ext4_fc_init_inode(struct inode *inode);









void ext4_fc_track_range(struct inode *inode, ext4_lblk_t start,









void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t start,









			 ext4_lblk_t end);









void ext4_fc_track_unlink(struct inode *inode, struct dentry *dentry);









void ext4_fc_track_link(struct inode *inode, struct dentry *dentry);









void ext4_fc_track_create(struct inode *inode, struct dentry *dentry);









void ext4_fc_track_inode(struct inode *inode);









void __ext4_fc_track_unlink(handle_t *handle, struct inode *inode,









	struct dentry *dentry);









void __ext4_fc_track_link(handle_t *handle, struct inode *inode,









	struct dentry *dentry);









void ext4_fc_track_unlink(handle_t *handle, struct dentry *dentry);









void ext4_fc_track_link(handle_t *handle, struct dentry *dentry);









void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);









void ext4_fc_track_inode(handle_t *handle, struct inode *inode);









void ext4_fc_mark_ineligible(struct super_block *sb, int reason);









void ext4_fc_start_ineligible(struct super_block *sb, int reason);









void ext4_fc_stop_ineligible(struct super_block *sb);








@@ -3452,7 +3478,7 @@ extern int ext4_handle_dirty_dirblock(handle_t *handle, struct inode *inode,







extern int ext4_ci_compare(const struct inode *parent,









			   const struct qstr *fname,









			   const struct qstr *entry, bool quick);









extern int __ext4_unlink(struct inode *dir, const struct qstr *d_name,









extern int __ext4_unlink(handle_t *handle, struct inode *dir, const struct qstr *d_name,









			 struct inode *inode);









extern int __ext4_link(struct inode *dir, struct inode *inode,









		       struct dentry *dentry);