Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fbf888a 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 changes from Ted Ts'o:
 "Ext4 updates for 3.13.  Mostly bug fixes and cleanups"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: add prototypes for macro-generated functions
  ext4: return non-zero st_blocks for inline data
  ext4: use prandom_u32() instead of get_random_bytes()
  ext4: remove unreachable code after ext4_can_extents_be_merged()
  ext4: remove unreachable code in ext4_can_extents_be_merged()
  ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea()
  ext4: don't count free clusters from a corrupt block group
  ext4: fix FITRIM in no journal mode
  ext4: drop set but otherwise unused variable from ext4_add_dirent_to_inline()
  ext4: change ext4_read_inline_dir() to return 0 on success
  ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
  ext4: add ratelimiting to ext4 messages
  ext4: fix performance regression in ext4_writepages
  ext4: fixup kerndoc annotation of mpage_map_and_submit_extent()
  ext4: fix assertion in ext4_add_complete_io()
parents 7e1a1e93 3f61c0cc

fs/ext4/balloc.c

+11 −2
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
	struct ext4_group_desc *gdp;

	ext4_group_t i;

	ext4_group_t ngroups = ext4_get_groups_count(sb);

	struct ext4_group_info *grp;

#ifdef EXT4FS_DEBUG

	struct ext4_super_block *es;

	ext4_fsblk_t bitmap_count;
@@ -655,6 +656,10 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)

			continue;

		grp = NULL;

		if (EXT4_SB(sb)->s_group_info)

			grp = ext4_get_group_info(sb, i);

		if (!grp || !EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			desc_count += ext4_free_group_clusters(sb, gdp);

		brelse(bitmap_bh);

		bitmap_bh = ext4_read_block_bitmap(sb, i);
@@ -679,6 +684,10 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)

			continue;

		grp = NULL;

		if (EXT4_SB(sb)->s_group_info)

			grp = ext4_get_group_info(sb, i);

		if (!grp || !EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			desc_count += ext4_free_group_clusters(sb, gdp);

	}

fs/ext4/ext4.h

+17 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/wait.h>

#include <linux/blockgroup_lock.h>

#include <linux/percpu_counter.h>

#include <linux/ratelimit.h>

#include <crypto/hash.h>

#ifdef __KERNEL__

#include <linux/compat.h>
@@ -1314,6 +1315,11 @@ struct ext4_sb_info { 
	unsigned long s_es_last_sorted;

	struct percpu_counter s_extent_cache_cnt;

	spinlock_t s_es_lru_lock ____cacheline_aligned_in_smp;



	/* Ratelimit ext4 messages. */

	struct ratelimit_state s_err_ratelimit_state;

	struct ratelimit_state s_warning_ratelimit_state;

	struct ratelimit_state s_msg_ratelimit_state;

};



static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
@@ -1396,7 +1402,18 @@ static inline void ext4_clear_inode_##name(struct inode *inode, int bit) \ 
	clear_bit(bit + (offset), &EXT4_I(inode)->i_##field);		\

}



/* Add these declarations here only so that these functions can be

 * found by name.  Otherwise, they are very hard to locate. */

static inline int ext4_test_inode_flag(struct inode *inode, int bit);

static inline void ext4_set_inode_flag(struct inode *inode, int bit);

static inline void ext4_clear_inode_flag(struct inode *inode, int bit);

EXT4_INODE_BIT_FNS(flag, flags, 0)



/* Add these declarations here only so that these functions can be

 * found by name.  Otherwise, they are very hard to locate. */

static inline int ext4_test_inode_state(struct inode *inode, int bit);

static inline void ext4_set_inode_state(struct inode *inode, int bit);

static inline void ext4_clear_inode_state(struct inode *inode, int bit);

#if (BITS_PER_LONG < 64)

EXT4_INODE_BIT_FNS(state, state_flags, 0)

fs/ext4/extents.c

+2 −33
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ int 
ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,

				struct ext4_extent *ex2)

{

	unsigned short ext1_ee_len, ext2_ee_len, max_len;

	unsigned short ext1_ee_len, ext2_ee_len;



	/*

	 * Make sure that both extents are initialized. We don't merge
@@ -1677,11 +1677,6 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1, 
	if (ext4_ext_is_uninitialized(ex1) || ext4_ext_is_uninitialized(ex2))

		return 0;



	if (ext4_ext_is_uninitialized(ex1))

		max_len = EXT_UNINIT_MAX_LEN;

	else

		max_len = EXT_INIT_MAX_LEN;



	ext1_ee_len = ext4_ext_get_actual_len(ex1);

	ext2_ee_len = ext4_ext_get_actual_len(ex2);
@@ -1694,7 +1689,7 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1, 
	 * as an RO_COMPAT feature, refuse to merge to extents if

	 * this can result in the top bit of ee_len being set.

	 */

	if (ext1_ee_len + ext2_ee_len > max_len)

	if (ext1_ee_len + ext2_ee_len > EXT_INIT_MAX_LEN)

		return 0;

#ifdef AGGRESSIVE_TEST

	if (ext1_ee_len >= 4)
@@ -1720,7 +1715,6 @@ static int ext4_ext_try_to_merge_right(struct inode *inode, 
	struct ext4_extent_header *eh;

	unsigned int depth, len;

	int merge_done = 0;

	int uninitialized = 0;



	depth = ext_depth(inode);

	BUG_ON(path[depth].p_hdr == NULL);
@@ -1730,12 +1724,8 @@ static int ext4_ext_try_to_merge_right(struct inode *inode, 
		if (!ext4_can_extents_be_merged(inode, ex, ex + 1))

			break;

		/* merge with next extent! */

		if (ext4_ext_is_uninitialized(ex))

			uninitialized = 1;

		ex->ee_len = cpu_to_le16(ext4_ext_get_actual_len(ex)

				+ ext4_ext_get_actual_len(ex + 1));

		if (uninitialized)

			ext4_ext_mark_uninitialized(ex);



		if (ex + 1 < EXT_LAST_EXTENT(eh)) {

			len = (EXT_LAST_EXTENT(eh) - ex - 1)
@@ -1890,7 +1880,6 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
	struct ext4_ext_path *npath = NULL;

	int depth, len, err;

	ext4_lblk_t next;

	unsigned uninitialized = 0;

	int mb_flags = 0;



	if (unlikely(ext4_ext_get_actual_len(newext) == 0)) {
@@ -1942,18 +1931,8 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
			if (err)

				return err;



			/*

			 * ext4_can_extents_be_merged should have checked

			 * that either both extents are uninitialized, or

			 * both aren't. Thus we need to check only one of

			 * them here.

			 */

			if (ext4_ext_is_uninitialized(ex))

				uninitialized = 1;

			ex->ee_len = cpu_to_le16(ext4_ext_get_actual_len(ex)

					+ ext4_ext_get_actual_len(newext));

			if (uninitialized)

				ext4_ext_mark_uninitialized(ex);

			eh = path[depth].p_hdr;

			nearex = ex;

			goto merge;
@@ -1976,20 +1955,10 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
			if (err)

				return err;



			/*

			 * ext4_can_extents_be_merged should have checked

			 * that either both extents are uninitialized, or

			 * both aren't. Thus we need to check only one of

			 * them here.

			 */

			if (ext4_ext_is_uninitialized(ex))

				uninitialized = 1;

			ex->ee_block = newext->ee_block;

			ext4_ext_store_pblock(ex, ext4_ext_pblock(newext));

			ex->ee_len = cpu_to_le16(ext4_ext_get_actual_len(ex)

					+ ext4_ext_get_actual_len(newext));

			if (uninitialized)

				ext4_ext_mark_uninitialized(ex);

			eh = path[depth].p_hdr;

			nearex = ex;

			goto merge;

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent, 
			ext4fs_dirhash(qstr->name, qstr->len, &hinfo);

			grp = hinfo.hash;

		} else

			get_random_bytes(&grp, sizeof(grp));

			grp = prandom_u32();

		parent_group = (unsigned)grp % ngroups;

		for (i = 0; i < ngroups; i++) {

			g = (parent_group + i) % ngroups;

fs/ext4/inline.c

+1 −2
Original line number Diff line number Diff line
@@ -994,11 +994,9 @@ static int ext4_add_dirent_to_inline(handle_t *handle, 
	struct inode	*dir = dentry->d_parent->d_inode;

	const char	*name = dentry->d_name.name;

	int		namelen = dentry->d_name.len;

	unsigned short	reclen;

	int		err;

	struct ext4_dir_entry_2 *de;



	reclen = EXT4_DIR_REC_LEN(namelen);

	err = ext4_find_dest_de(dir, inode, iloc->bh,

				inline_start, inline_size,

				name, namelen, &de);
@@ -1442,6 +1440,7 @@ int ext4_read_inline_dir(struct file *file, 
	if (ret < 0)

		goto out;



	ret = 0;

	sb = inode->i_sb;

	parent_ino = le32_to_cpu(((struct ext4_dir_entry_2 *)dir_buf)->inode);

	offset = ctx->pos;