Commit 439f1da9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 fixes from Ted Ts'o:
 "Miscellaneous bug fixes and cleanups for ext4, including a fix for
  generic/388 in data=journal mode, removing some BUG_ON's, and cleaning
  up some compiler warnings"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: convert BUG_ON's to WARN_ON's in mballoc.c
  ext4: increase wait time needed before reuse of deleted inode numbers
  ext4: remove set but not used variable 'es' in ext4_jbd2.c
  ext4: remove set but not used variable 'es'
  ext4: do not zeroout extents beyond i_disksize
  ext4: fix return-value types in several function comments
  ext4: use non-movable memory for superblock readahead
  ext4: use matching invalidatepage in ext4_writepage
parents aee0314b 907ea529

fs/buffer.c

+11 −0
Original line number Diff line number Diff line
@@ -1371,6 +1371,17 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) 
}

EXPORT_SYMBOL(__breadahead);



void __breadahead_gfp(struct block_device *bdev, sector_t block, unsigned size,

		      gfp_t gfp)

{

	struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp);

	if (likely(bh)) {

		ll_rw_block(REQ_OP_READ, REQ_RAHEAD, 1, &bh);

		brelse(bh);

	}

}

EXPORT_SYMBOL(__breadahead_gfp);



/**

 *  __bread_gfp() - reads a specified block and returns the bh

 *  @bdev: the block_device to read from

fs/ext4/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ verified: 
 * Read the bitmap for a given block_group,and validate the

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

 *

 * Return buffer_head on success or NULL in case of failure.

 * Return buffer_head on success or an ERR_PTR in case of failure.

 */

struct buffer_head *

ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)
@@ -502,7 +502,7 @@ out: 
	return ERR_PTR(err);

}



/* Returns 0 on success, 1 on error */

/* Returns 0 on success, -errno on error */

int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group,

			   struct buffer_head *bh)

{

fs/ext4/ext4_jbd2.c

+0 −3
Original line number Diff line number Diff line
@@ -338,9 +338,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
		if (inode && inode_needs_sync(inode)) {

			sync_dirty_buffer(bh);

			if (buffer_req(bh) && !buffer_uptodate(bh)) {

				struct ext4_super_block *es;



				es = EXT4_SB(inode->i_sb)->s_es;

				ext4_error_inode_err(inode, where, line,

						     bh->b_blocknr, EIO,

					"IO error syncing itable block");

fs/ext4/extents.c

+4 −4
Original line number Diff line number Diff line
@@ -3374,8 +3374,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, 
		(unsigned long long)map->m_lblk, map_len);



	sbi = EXT4_SB(inode->i_sb);

	eof_block = (inode->i_size + inode->i_sb->s_blocksize - 1) >>

		inode->i_sb->s_blocksize_bits;

	eof_block = (EXT4_I(inode)->i_disksize + inode->i_sb->s_blocksize - 1)

			>> inode->i_sb->s_blocksize_bits;

	if (eof_block < map->m_lblk + map_len)

		eof_block = map->m_lblk + map_len;
@@ -3627,8 +3627,8 @@ static int ext4_split_convert_extents(handle_t *handle, 
		  __func__, inode->i_ino,

		  (unsigned long long)map->m_lblk, map->m_len);



	eof_block = (inode->i_size + inode->i_sb->s_blocksize - 1) >>

		inode->i_sb->s_blocksize_bits;

	eof_block = (EXT4_I(inode)->i_disksize + inode->i_sb->s_blocksize - 1)

			>> inode->i_sb->s_blocksize_bits;

	if (eof_block < map->m_lblk + map->m_len)

		eof_block = map->m_lblk + map->m_len;

	/*

fs/ext4/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ verified: 
 * Read the inode allocation bitmap for a given block_group, reading

 * into the specified slot in the superblock's bitmap cache.

 *

 * Return buffer_head of bitmap on success or NULL.

 * Return buffer_head of bitmap on success, or an ERR_PTR on error.

 */

static struct buffer_head *

ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
@@ -662,7 +662,7 @@ static int find_group_other(struct super_block *sb, struct inode *parent, 
 * block has been written back to disk.  (Yes, these values are

 * somewhat arbitrary...)

 */

#define RECENTCY_MIN	5

#define RECENTCY_MIN	60

#define RECENTCY_DIRTY	300



static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino)

CRA Git | Maintained and supported by SUSTech CRA and CCSE