Commit 9c94b395 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:

 - Replace ext4's bmap and iopoll implementations to use iomap.

 - Clean up extent tree handling.

 - Other cleanups and miscellaneous bug fixes

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
  ext4: save all error info in save_error_info() and drop ext4_set_errno()
  ext4: fix incorrect group count in ext4_fill_super error message
  ext4: fix incorrect inodes per group in error message
  ext4: don't set dioread_nolock by default for blocksize < pagesize
  ext4: disable dioread_nolock whenever delayed allocation is disabled
  ext4: do not commit super on read-only bdev
  ext4: avoid ENOSPC when avoiding to reuse recently deleted inodes
  ext4: unregister sysfs path before destroying jbd2 journal
  ext4: check for non-zero journal inum in ext4_calculate_overhead
  ext4: remove map_from_cluster from ext4_ext_map_blocks
  ext4: clean up ext4_ext_insert_extent() call in ext4_ext_map_blocks()
  ext4: mark block bitmap corrupted when found instead of BUGON
  ext4: use flexible-array member for xattr structs
  ext4: use flexible-array member in struct fname
  Documentation: correct the description of FIEMAP_EXTENT_LAST
  ext4: move ext4_fiemap to use iomap framework
  ext4: make ext4_ind_map_blocks work with fiemap
  ext4: move ext4 bmap to use iomap infrastructure
  ext4: optimize ext4_ext_precache for 0 depth
  ext4: add IOMAP_F_MERGED for non-extent based mapping
  ...
parents 34761956 54d3adbc

Documentation/filesystems/fiemap.txt

+4 −2
Original line number Diff line number Diff line
@@ -115,8 +115,10 @@ data. Note that the opposite is not true - it would be valid for 
FIEMAP_EXTENT_NOT_ALIGNED to appear alone.



* FIEMAP_EXTENT_LAST

This is the last extent in the file. A mapping attempt past this

extent will return nothing.

This is generally the last extent in the file. A mapping attempt past

this extent may return nothing. Some implementations set this flag to

indicate this extent is the last one in the range queried by the user

(via fiemap->fm_length).



* FIEMAP_EXTENT_UNKNOWN

The location of this extent is currently unknown. This may indicate

fs/ext4/balloc.c

+3 −4
Original line number Diff line number Diff line
@@ -516,8 +516,7 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group, 
	wait_on_buffer(bh);

	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_BBITMAP_EIO);

	if (!buffer_uptodate(bh)) {

		ext4_set_errno(sb, EIO);

		ext4_error(sb, "Cannot read block bitmap - "

		ext4_error_err(sb, EIO, "Cannot read block bitmap - "

			       "block_group = %u, block_bitmap = %llu",

			       block_group, (unsigned long long) bh->b_blocknr);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

fs/ext4/block_validity.c

+7 −11
Original line number Diff line number Diff line
@@ -166,10 +166,8 @@ static int ext4_data_block_valid_rcu(struct ext4_sb_info *sbi, 


	if ((start_blk <= le32_to_cpu(sbi->s_es->s_first_data_block)) ||

	    (start_blk + count < start_blk) ||

	    (start_blk + count > ext4_blocks_count(sbi->s_es))) {

		sbi->s_es->s_last_error_block = cpu_to_le64(start_blk);

	    (start_blk + count > ext4_blocks_count(sbi->s_es)))

		return 0;

	}



	if (system_blks == NULL)

		return 1;
@@ -181,11 +179,9 @@ static int ext4_data_block_valid_rcu(struct ext4_sb_info *sbi, 
			n = n->rb_left;

		else if (start_blk >= (entry->start_blk + entry->count))

			n = n->rb_right;

		else {

			sbi->s_es->s_last_error_block = cpu_to_le64(start_blk);

		else

			return 0;

	}

	}

	return 1;

}
@@ -220,10 +216,12 @@ static int ext4_protect_reserved_inode(struct super_block *sb, 
		} else {

			if (!ext4_data_block_valid_rcu(sbi, system_blks,

						map.m_pblk, n)) {

				ext4_error(sb, "blocks %llu-%llu from inode %u "

					   "overlap system zone", map.m_pblk,

					   map.m_pblk + map.m_len - 1, ino);

				err = -EFSCORRUPTED;

				__ext4_error(sb, __func__, __LINE__, -err,

					     map.m_pblk, "blocks %llu-%llu "

					     "from inode %u overlap system zone",

					     map.m_pblk,

					     map.m_pblk + map.m_len - 1, ino);

				break;

			}

			err = add_system_zone(system_blks, map.m_pblk, n);
@@ -365,7 +363,6 @@ int ext4_data_block_valid(struct ext4_sb_info *sbi, ext4_fsblk_t start_blk, 
int ext4_check_blockref(const char *function, unsigned int line,

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

{

	struct ext4_super_block *es = EXT4_SB(inode->i_sb)->s_es;

	__le32 *bref = p;

	unsigned int blk;
@@ -379,7 +376,6 @@ int ext4_check_blockref(const char *function, unsigned int line, 
		if (blk &&

		    unlikely(!ext4_data_block_valid(EXT4_SB(inode->i_sb),

						    blk, 1))) {

			es->s_last_error_block = cpu_to_le64(blk);

			ext4_error_inode(inode, function, line, blk,

					 "invalid block");

			return -EFSCORRUPTED;

fs/ext4/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ struct fname { 
	__u32		inode;

	__u8		name_len;

	__u8		file_type;

	char		name[0];

	char		name[];

};



/*

fs/ext4/ext4.h

+38 −21
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ struct flex_groups { 
#define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */

#define EXT4_VERITY_FL			0x00100000 /* Verity protected inode */

#define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */

#define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */

/* 0x00400000 was formerly EXT4_EOFBLOCKS_FL */

#define EXT4_INLINE_DATA_FL		0x10000000 /* Inode has inline data. */

#define EXT4_PROJINHERIT_FL		0x20000000 /* Create with parents projid */

#define EXT4_CASEFOLD_FL		0x40000000 /* Casefolded file */
@@ -487,7 +487,7 @@ enum { 
	EXT4_INODE_EXTENTS	= 19,	/* Inode uses extents */

	EXT4_INODE_VERITY	= 20,	/* Verity protected inode */

	EXT4_INODE_EA_INODE	= 21,	/* Inode used for large EA */

	EXT4_INODE_EOFBLOCKS	= 22,	/* Blocks allocated beyond EOF */

/* 22 was formerly EXT4_INODE_EOFBLOCKS */

	EXT4_INODE_INLINE_DATA	= 28,	/* Data in inode. */

	EXT4_INODE_PROJINHERIT	= 29,	/* Create with parents projid */

	EXT4_INODE_RESERVED	= 31,	/* reserved for ext4 lib */
@@ -533,7 +533,6 @@ static inline void ext4_check_flag_values(void) 
	CHECK_FLAG_VALUE(EXTENTS);

	CHECK_FLAG_VALUE(VERITY);

	CHECK_FLAG_VALUE(EA_INODE);

	CHECK_FLAG_VALUE(EOFBLOCKS);

	CHECK_FLAG_VALUE(INLINE_DATA);

	CHECK_FLAG_VALUE(PROJINHERIT);

	CHECK_FLAG_VALUE(RESERVED);
@@ -2771,21 +2770,20 @@ extern const char *ext4_decode_error(struct super_block *sb, int errno, 
extern void ext4_mark_group_bitmap_corrupted(struct super_block *sb,

					     ext4_group_t block_group,

					     unsigned int flags);

extern void ext4_set_errno(struct super_block *sb, int err);



extern __printf(4, 5)

void __ext4_error(struct super_block *, const char *, unsigned int,

		  const char *, ...);

extern __printf(5, 6)

void __ext4_error_inode(struct inode *, const char *, unsigned int, ext4_fsblk_t,

extern __printf(6, 7)

void __ext4_error(struct super_block *, const char *, unsigned int, int, __u64,

		  const char *, ...);

extern __printf(6, 7)

void __ext4_error_inode(struct inode *, const char *, unsigned int,

			ext4_fsblk_t, int, const char *, ...);

extern __printf(5, 6)

void __ext4_error_file(struct file *, const char *, unsigned int, ext4_fsblk_t,

		     const char *, ...);

extern void __ext4_std_error(struct super_block *, const char *,

			     unsigned int, int);

extern __printf(4, 5)

void __ext4_abort(struct super_block *, const char *, unsigned int,

extern __printf(5, 6)

void __ext4_abort(struct super_block *, const char *, unsigned int, int,

		  const char *, ...);

extern __printf(4, 5)

void __ext4_warning(struct super_block *, const char *, unsigned int,
@@ -2806,8 +2804,12 @@ void __ext4_grp_locked_error(const char *, unsigned int, 
#define EXT4_ERROR_INODE(inode, fmt, a...) \

	ext4_error_inode((inode), __func__, __LINE__, 0, (fmt), ## a)



#define EXT4_ERROR_INODE_BLOCK(inode, block, fmt, a...)			\

	ext4_error_inode((inode), __func__, __LINE__, (block), (fmt), ## a)

#define EXT4_ERROR_INODE_ERR(inode, err, fmt, a...)			\

	__ext4_error_inode((inode), __func__, __LINE__, 0, (err), (fmt), ## a)



#define ext4_error_inode_block(inode, block, err, fmt, a...)		\

	__ext4_error_inode((inode), __func__, __LINE__, (block), (err),	\

			   (fmt), ## a)



#define EXT4_ERROR_FILE(file, block, fmt, a...)				\

	ext4_error_file((file), __func__, __LINE__, (block), (fmt), ## a)
@@ -2815,13 +2817,18 @@ void __ext4_grp_locked_error(const char *, unsigned int, 
#ifdef CONFIG_PRINTK



#define ext4_error_inode(inode, func, line, block, fmt, ...)		\

	__ext4_error_inode(inode, func, line, block, fmt, ##__VA_ARGS__)

	__ext4_error_inode(inode, func, line, block, 0, fmt, ##__VA_ARGS__)

#define ext4_error_inode_err(inode, func, line, block, err, fmt, ...)	\

	__ext4_error_inode((inode), (func), (line), (block), 		\

			   (err), (fmt), ##__VA_ARGS__)

#define ext4_error_file(file, func, line, block, fmt, ...)		\

	__ext4_error_file(file, func, line, block, fmt, ##__VA_ARGS__)

#define ext4_error(sb, fmt, ...)					\

	__ext4_error(sb, __func__, __LINE__, fmt, ##__VA_ARGS__)

#define ext4_abort(sb, fmt, ...)					\

	__ext4_abort(sb, __func__, __LINE__, fmt, ##__VA_ARGS__)

	__ext4_error((sb), __func__, __LINE__, 0, 0, (fmt), ##__VA_ARGS__)

#define ext4_error_err(sb, err, fmt, ...)				\

	__ext4_error((sb), __func__, __LINE__, (err), 0, (fmt), ##__VA_ARGS__)

#define ext4_abort(sb, err, fmt, ...)					\

	__ext4_abort((sb), __func__, __LINE__, (err), (fmt), ##__VA_ARGS__)

#define ext4_warning(sb, fmt, ...)					\

	__ext4_warning(sb, __func__, __LINE__, fmt, ##__VA_ARGS__)

#define ext4_warning_inode(inode, fmt, ...)				\
@@ -2839,7 +2846,12 @@ void __ext4_grp_locked_error(const char *, unsigned int, 
#define ext4_error_inode(inode, func, line, block, fmt, ...)		\

do {									\

	no_printk(fmt, ##__VA_ARGS__);					\

	__ext4_error_inode(inode, "", 0, block, " ");			\

	__ext4_error_inode(inode, "", 0, block, 0, " ");		\

} while (0)

#define ext4_error_inode_err(inode, func, line, block, err, fmt, ...)	\

do {									\

	no_printk(fmt, ##__VA_ARGS__);					\

	__ext4_error_inode(inode, "", 0, block, err, " ");		\

} while (0)

#define ext4_error_file(file, func, line, block, fmt, ...)		\

do {									\
@@ -2849,12 +2861,17 @@ do { \ 
#define ext4_error(sb, fmt, ...)					\

do {									\

	no_printk(fmt, ##__VA_ARGS__);					\

	__ext4_error(sb, "", 0, " ");					\

	__ext4_error(sb, "", 0, 0, 0, " ");				\

} while (0)

#define ext4_error_err(sb, err, fmt, ...)				\

do {									\

	no_printk(fmt, ##__VA_ARGS__);					\

	__ext4_error(sb, "", 0, err, 0, " ");				\

} while (0)

#define ext4_abort(sb, fmt, ...)					\

#define ext4_abort(sb, err, fmt, ...)					\

do {									\

	no_printk(fmt, ##__VA_ARGS__);					\

	__ext4_abort(sb, "", 0, " ");					\

	__ext4_abort(sb, "", 0, err, " ");				\

} while (0)

#define ext4_warning(sb, fmt, ...)					\

do {									\

CRA Git | Maintained and supported by SUSTech CRA and CCSE