Commit 1434763c 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:
 "A lot of cleanups and bug fixes, especially dealing with corrupted
  file systems"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (23 commits)
  ext4: fix fencepost error in check for inode count overflow during resize
  ext4: correctly handle a zero-length xattr with a non-zero e_value_offs
  ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget()
  ext4: do not allow external inodes for inline data
  ext4: report delalloc reserve as non-free in statfs for project quota
  ext4: remove NULL check before calling kmem_cache_destroy()
  jbd2: remove NULL check before calling kmem_cache_destroy()
  jbd2: remove bunch of empty lines with jbd2 debug
  ext4: handle errors on ext4_commit_super
  ext4: do not update s_last_mounted of a frozen fs
  ext4: factor out helper ext4_sample_last_mounted()
  vfs: add the sb_start_intwrite_trylock() helper
  ext4: update mtime in ext4_punch_hole even if no blocks are released
  ext4: add verifier check for symlink with append/immutable flags
  fs: ext4: add new return type vm_fault_t
  ext4: fix hole length detection in ext4_ind_map_blocks()
  ext4: mark block bitmap corrupted when found
  ext4: mark inode bitmap corrupted when found
  ext4: add new ext4_mark_group_bitmap_corrupted() helper
  ext4: fix wrong return value in ext4_read_inode_bitmap()
  ...
parents 5037be16 4f2f76f7

fs/ext4/balloc.c

+11 −22
Original line number Diff line number Diff line
@@ -185,25 +185,15 @@ static int ext4_init_block_bitmap(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_fsblk_t start, tmp;

	int flex_bg = 0;

	struct ext4_group_info *grp;



	J_ASSERT_BH(bh, buffer_locked(bh));



	/* If checksum is bad mark all blocks used to prevent allocation

	 * essentially implementing a per-group read-only flag. */

	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

		grp = ext4_get_group_info(sb, block_group);

		if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			percpu_counter_sub(&sbi->s_freeclusters_counter,

					   grp->bb_free);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

		if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {

			int count;

			count = ext4_free_inodes_count(sb, gdp);

			percpu_counter_sub(&sbi->s_freeinodes_counter,

					   count);

		}

		set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT |

					EXT4_GROUP_INFO_IBITMAP_CORRUPT);

		return -EFSBADCRC;

	}

	memset(bh->b_data, 0, sb->s_blocksize);
@@ -375,7 +365,6 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
{

	ext4_fsblk_t	blk;

	struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (buffer_verified(bh))

		return 0;
@@ -387,10 +376,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
			desc, bh))) {

		ext4_unlock_group(sb, block_group);

		ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);

		if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			percpu_counter_sub(&sbi->s_freeclusters_counter,

					   grp->bb_free);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return -EFSBADCRC;

	}

	blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
@@ -398,10 +385,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
		ext4_unlock_group(sb, block_group);

		ext4_error(sb, "bg %u: block %llu: invalid block bitmap",

			   block_group, blk);

		if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			percpu_counter_sub(&sbi->s_freeclusters_counter,

					   grp->bb_free);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return -EFSCORRUPTED;

	}

	set_buffer_verified(bh);
@@ -436,6 +421,8 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
	    (bitmap_blk >= ext4_blocks_count(sbi->s_es))) {

		ext4_error(sb, "Invalid block bitmap block %llu in "

			   "block_group %u", bitmap_blk, block_group);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return ERR_PTR(-EFSCORRUPTED);

	}

	bh = sb_getblk(sb, bitmap_blk);
@@ -514,6 +501,8 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group, 
		ext4_error(sb, "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,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return -EIO;

	}

	clear_buffer_new(bh);

fs/ext4/ext4.h

+7 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,9 @@ extern int ext4_alloc_flex_bg_array(struct super_block *sb, 
				    ext4_group_t ngroup);

extern const char *ext4_decode_error(struct super_block *sb, int errno,

				     char nbuf[16]);

extern void ext4_mark_group_bitmap_corrupted(struct super_block *sb,

					     ext4_group_t block_group,

					     unsigned int flags);



extern __printf(4, 5)

void __ext4_error(struct super_block *, const char *, unsigned int,
@@ -2857,6 +2860,10 @@ struct ext4_group_info { 
#define EXT4_GROUP_INFO_WAS_TRIMMED_BIT		1

#define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT	2

#define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT	3

#define EXT4_GROUP_INFO_BBITMAP_CORRUPT		\

	(1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)

#define EXT4_GROUP_INFO_IBITMAP_CORRUPT		\

	(1 << EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT)



#define EXT4_MB_GRP_NEED_INIT(grp)	\

	(test_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &((grp)->bb_state)))

fs/ext4/extents_status.c

+1 −2
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ int __init ext4_init_es(void) 


void ext4_exit_es(void)

{

	if (ext4_es_cachep)

	kmem_cache_destroy(ext4_es_cachep);

}

fs/ext4/file.c

+54 −39
Original line number Diff line number Diff line
@@ -277,10 +277,11 @@ out: 
}



#ifdef CONFIG_FS_DAX

static int ext4_dax_huge_fault(struct vm_fault *vmf,

static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf,

		enum page_entry_size pe_size)

{

	int result, error = 0;

	int error = 0;

	vm_fault_t result;

	int retries = 0;

	handle_t *handle = NULL;

	struct inode *inode = file_inode(vmf->vma->vm_file);
@@ -335,7 +336,7 @@ retry: 
	return result;

}



static int ext4_dax_fault(struct vm_fault *vmf)

static vm_fault_t ext4_dax_fault(struct vm_fault *vmf)

{

	return ext4_dax_huge_fault(vmf, PE_SIZE_PTE);

}
@@ -380,20 +381,21 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) 
	return 0;

}



static int ext4_file_open(struct inode * inode, struct file * filp)

static int ext4_sample_last_mounted(struct super_block *sb,

				    struct vfsmount *mnt)

{

	struct super_block *sb = inode->i_sb;

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

	struct vfsmount *mnt = filp->f_path.mnt;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct path path;

	char buf[64], *cp;

	int ret;

	handle_t *handle;

	int err;



	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;

	if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED))

		return 0;



	if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb))

		return 0;



	if (unlikely(!(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED) &&

		     !sb_rdonly(sb))) {

	sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED;

	/*

	 * Sample where the filesystem has been mounted and
@@ -405,25 +407,38 @@ static int ext4_file_open(struct inode * inode, struct file * filp) 
	path.mnt = mnt;

	path.dentry = mnt->mnt_root;

	cp = d_path(&path, buf, sizeof(buf));

		if (!IS_ERR(cp)) {

			handle_t *handle;

			int err;

	err = 0;

	if (IS_ERR(cp))

		goto out;



	handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1);

	err = PTR_ERR(handle);

	if (IS_ERR(handle))

				return PTR_ERR(handle);

		goto out;

	BUFFER_TRACE(sbi->s_sbh, "get_write_access");

	err = ext4_journal_get_write_access(handle, sbi->s_sbh);

			if (err) {

				ext4_journal_stop(handle);

				return err;

			}

	if (err)

		goto out_journal;

	strlcpy(sbi->s_es->s_last_mounted, cp,

		sizeof(sbi->s_es->s_last_mounted));

	ext4_handle_dirty_super(handle, sb);

out_journal:

	ext4_journal_stop(handle);

out:

	sb_end_intwrite(sb);

	return err;

}

	}



static int ext4_file_open(struct inode * inode, struct file * filp)

{

	int ret;



	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;



	ret = ext4_sample_last_mounted(inode->i_sb, filp->f_path.mnt);

	if (ret)

		return ret;



	ret = fscrypt_file_open(inode, filp);

	if (ret)

fs/ext4/fsmap.c

+2 −2
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void ext4_getfsmap_free_fixed_metadata(struct list_head *meta_list) 
}



/* Find all the fixed metadata in the filesystem. */

int ext4_getfsmap_find_fixed_metadata(struct super_block *sb,

static int ext4_getfsmap_find_fixed_metadata(struct super_block *sb,

					     struct list_head *meta_list)

{

	struct ext4_group_desc *gdp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE