Commit 9b03992f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 updates from Ted Ts'o:
 "Fix some bugs in converting ext4 to use the new mount API, as well as
  more bug fixes and clean ups in the ext4 fast_commit feature (most
  notably, in the tracepoints).

  In the jbd2 layer, the t_handle_lock spinlock has been removed, with
  the last place where it was actually needed replaced with an atomic
  cmpxchg"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (35 commits)
  ext4: fix kernel doc warnings
  ext4: fix remaining two trace events to use same printk convention
  ext4: add commit tid info in ext4_fc_commit_start/stop trace events
  ext4: add commit_tid info in jbd debug log
  ext4: add transaction tid info in fc_track events
  ext4: add new trace event in ext4_fc_cleanup
  ext4: return early for non-eligible fast_commit track events
  ext4: do not call FC trace event in ext4_fc_commit() if FS does not support FC
  ext4: convert ext4_fc_track_dentry type events to use event class
  ext4: fix ext4_fc_stats trace point
  ext4: remove unused enum EXT4_FC_COMMIT_FAILED
  ext4: warn when dirtying page w/o buffers in data=journal mode
  doc: fixed a typo in ext4 documentation
  ext4: make mb_optimize_scan performance mount option work with extents
  ext4: make mb_optimize_scan option work with set/unset mount cmd
  ext4: don't BUG if someone dirty pages without asking ext4 first
  ext4: remove redundant assignment to variable split_flag1
  ext4: fix underflow in ext4_max_bitmap_size()
  ext4: fix ext4_mb_clear_bb() kernel-doc comment
  ext4: fix fs corruption when tring to remove a non-empty directory with IO error
  ...
parents 14705fda 919adbfe

Documentation/filesystems/ext4/blocks.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ For 32-bit filesystems, limits are as follows: 
     - 4TiB

     - 8TiB

     - 16TiB

     - 256PiB

     - 256TiB

   * - Blocks Per Block Group

     - 8,192

     - 16,384

fs/ext4/balloc.c

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
 * ext4_read_block_bitmap_nowait()

 * @sb:			super block

 * @block_group:	given block group

 * @ignore_locked:	ignore locked buffers

 *

 * Read the bitmap for a given block_group,and validate the

 * bits for block/inode/inode tables are set in the bitmaps

fs/ext4/block_validity.c

+17 −9
Original line number Diff line number Diff line
@@ -292,15 +292,10 @@ void ext4_release_system_zone(struct super_block *sb) 
		call_rcu(&system_blks->rcu, ext4_destroy_system_zone);

}



/*

 * Returns 1 if the passed-in block region (start_blk,

 * start_blk+count) is valid; 0 if some part of the block region

 * overlaps with some other filesystem metadata blocks.

 */

int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk,

			  unsigned int count)

int ext4_sb_block_valid(struct super_block *sb, struct inode *inode,

				ext4_fsblk_t start_blk, unsigned int count)

{

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_system_blocks *system_blks;

	struct ext4_system_zone *entry;

	struct rb_node *n;
@@ -329,6 +324,8 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, 
		else if (start_blk >= (entry->start_blk + entry->count))

			n = n->rb_right;

		else {

			ret = 0;

			if (inode)

				ret = (entry->ino == inode->i_ino);

			break;

		}
@@ -338,6 +335,17 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, 
	return ret;

}



/*

 * Returns 1 if the passed-in block region (start_blk,

 * start_blk+count) is valid; 0 if some part of the block region

 * overlaps with some other filesystem metadata blocks.

 */

int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk,

			  unsigned int count)

{

	return ext4_sb_block_valid(inode->i_sb, inode, start_blk, count);

}



int ext4_check_blockref(const char *function, unsigned int line,

			struct inode *inode, __le32 *p, unsigned int max)

{

fs/ext4/ext4.h

+6 −1
Original line number Diff line number Diff line
@@ -1046,6 +1046,8 @@ struct ext4_inode_info { 


	/* Fast commit related info */



	/* For tracking dentry create updates */

	struct list_head i_fc_dilist;

	struct list_head i_fc_list;	/*

					 * inodes that need fast commit

					 * protected by sbi->s_fc_lock.
@@ -1279,7 +1281,7 @@ struct ext4_inode_info { 
#define ext4_find_next_zero_bit		find_next_zero_bit_le

#define ext4_find_next_bit		find_next_bit_le



extern void ext4_set_bits(void *bm, int cur, int len);

extern void mb_set_bits(void *bm, int cur, int len);



/*

 * Maximal mount counts between two filesystem checks
@@ -3707,6 +3709,9 @@ extern int ext4_inode_block_valid(struct inode *inode, 
				  unsigned int count);

extern int ext4_check_blockref(const char *, unsigned int,

			       struct inode *, __le32 *, unsigned int);

extern int ext4_sb_block_valid(struct super_block *sb, struct inode *inode,

				ext4_fsblk_t start_blk, unsigned int count);





/* extents.c */

struct ext4_ext_path;

fs/ext4/extents.c

+0 −1
Original line number Diff line number Diff line
@@ -3368,7 +3368,6 @@ static int ext4_split_extent(handle_t *handle, 
		return -EFSCORRUPTED;

	}

	unwritten = ext4_ext_is_unwritten(ex);

	split_flag1 = 0;



	if (map->m_lblk >= ee_block) {

		split_flag1 = split_flag & EXT4_EXT_DATA_VALID2;