Commit 8a8b8096 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 ext4 bug fixes (all stable fodder)"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: improve explanation of a mount failure caused by a misconfigured kernel
  jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer
  jbd2: move the clearing of b_modified flag to the journal_unmap_buffer()
  ext4: add cond_resched() to ext4_protect_reserved_inode
  ext4: fix checksum errors with indexed dirs
  ext4: fix support for inode sizes > 1024 bytes
  ext4: simplify checking quota limits in ext4_statfs()
  ext4: don't assume that mmp_nodename/bdevname have NUL
parents db70e26e d65d87a0

fs/ext4/block_validity.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static int ext4_protect_reserved_inode(struct super_block *sb, 
		return PTR_ERR(inode);

	num = (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;

	while (i < num) {

		cond_resched();

		map.m_lblk = i;

		map.m_len = num - i;

		n = ext4_map_blocks(NULL, inode, &map, 0);

fs/ext4/dir.c

+8 −6
Original line number Diff line number Diff line
@@ -129,12 +129,14 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
		if (err != ERR_BAD_DX_DIR) {

			return err;

		}

		/* Can we just clear INDEX flag to ignore htree information? */

		if (!ext4_has_metadata_csum(sb)) {

			/*

			 * We don't set the inode dirty flag since it's not

		 * critical that it get flushed back to the disk.

			 * critical that it gets flushed back to the disk.

			 */

		ext4_clear_inode_flag(file_inode(file),

				      EXT4_INODE_INDEX);

			ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);

		}

	}



	if (ext4_has_inline_data(inode)) {

fs/ext4/ext4.h

+4 −1
Original line number Diff line number Diff line
@@ -2544,9 +2544,12 @@ void ext4_insert_dentry(struct inode *inode, 
			struct ext4_filename *fname);

static inline void ext4_update_dx_flag(struct inode *inode)

{

	if (!ext4_has_feature_dir_index(inode->i_sb))

	if (!ext4_has_feature_dir_index(inode->i_sb)) {

		/* ext4_iget() should have caught this... */

		WARN_ON_ONCE(ext4_has_feature_metadata_csum(inode->i_sb));

		ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);

	}

}

static const unsigned char ext4_filetype_table[] = {

	DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK

};

fs/ext4/inode.c

+12 −0
Original line number Diff line number Diff line
@@ -4644,6 +4644,18 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, 
		ret = -EFSCORRUPTED;

		goto bad_inode;

	}

	/*

	 * If dir_index is not enabled but there's dir with INDEX flag set,

	 * we'd normally treat htree data as empty space. But with metadata

	 * checksumming that corrupts checksums so forbid that.

	 */

	if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) &&

	    ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {

		ext4_error_inode(inode, function, line, 0,

			 "iget: Dir with htree data on filesystem without dir_index feature.");

		ret = -EFSCORRUPTED;

		goto bad_inode;

	}

	ei->i_disksize = inode->i_size;

#ifdef CONFIG_QUOTA

	ei->i_reserved_quota = 0;

fs/ext4/mmp.c

+7 −5
Original line number Diff line number Diff line
@@ -120,10 +120,10 @@ void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp, 
{

	__ext4_warning(sb, function, line, "%s", msg);

	__ext4_warning(sb, function, line,

		       "MMP failure info: last update time: %llu, last update "

		       "node: %s, last update device: %s",

		       (long long unsigned int) le64_to_cpu(mmp->mmp_time),

		       mmp->mmp_nodename, mmp->mmp_bdevname);

		       "MMP failure info: last update time: %llu, last update node: %.*s, last update device: %.*s",

		       (unsigned long long)le64_to_cpu(mmp->mmp_time),

		       (int)sizeof(mmp->mmp_nodename), mmp->mmp_nodename,

		       (int)sizeof(mmp->mmp_bdevname), mmp->mmp_bdevname);

}



/*
@@ -154,6 +154,7 @@ static int kmmpd(void *data) 
	mmp_check_interval = max(EXT4_MMP_CHECK_MULT * mmp_update_interval,

				 EXT4_MMP_MIN_CHECK_INTERVAL);

	mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);

	BUILD_BUG_ON(sizeof(mmp->mmp_bdevname) < BDEVNAME_SIZE);

	bdevname(bh->b_bdev, mmp->mmp_bdevname);



	memcpy(mmp->mmp_nodename, init_utsname()->nodename,
@@ -379,7 +380,8 @@ skip: 
	/*

	 * Start a kernel thread to update the MMP block periodically.

	 */

	EXT4_SB(sb)->s_mmp_tsk = kthread_run(kmmpd, mmpd_data, "kmmpd-%s",

	EXT4_SB(sb)->s_mmp_tsk = kthread_run(kmmpd, mmpd_data, "kmmpd-%.*s",

					     (int)sizeof(mmp->mmp_bdevname),

					     bdevname(bh->b_bdev,

						      mmp->mmp_bdevname));

	if (IS_ERR(EXT4_SB(sb)->s_mmp_tsk)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE