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

Commit 39f1cd63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs
  ext4: Don't use delayed allocation by default when used instead of ext3
  ext4: Fix spelling of CONTIG_FS_EXT3 to CONFIG_FS_EXT3
  ext4: Fix estimate of # of blocks needed to write indirect-mapped files
parents 126a031e c4caae25

fs/ext4/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode) 
					ext4_group_t f;



					f = ext4_flex_group(sbi, block_group);

					atomic_dec(&sbi->s_flex_groups[f].free_inodes);

					atomic_dec(&sbi->s_flex_groups[f].used_dirs);

				}



			}
@@ -773,7 +773,7 @@ static int ext4_claim_inode(struct super_block *sb, 
		if (sbi->s_log_groups_per_flex) {

			ext4_group_t f = ext4_flex_group(sbi, group);



			atomic_inc(&sbi->s_flex_groups[f].free_inodes);

			atomic_inc(&sbi->s_flex_groups[f].used_dirs);

		}

	}

	gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static int ext4_indirect_calc_metadata_amount(struct inode *inode, 
					      sector_t lblock)

{

	struct ext4_inode_info *ei = EXT4_I(inode);

	int dind_mask = EXT4_ADDR_PER_BLOCK(inode->i_sb) - 1;

	sector_t dind_mask = ~((sector_t)EXT4_ADDR_PER_BLOCK(inode->i_sb) - 1);

	int blk_bits;



	if (lblock < EXT4_NDIR_BLOCKS)
@@ -1050,7 +1050,7 @@ static int ext4_indirect_calc_metadata_amount(struct inode *inode, 
	}

	ei->i_da_metadata_calc_last_lblock = lblock & dind_mask;

	ei->i_da_metadata_calc_len = 1;

	blk_bits = roundup_pow_of_two(lblock + 1);

	blk_bits = order_base_2(lblock);

	return (blk_bits / EXT4_ADDR_PER_BLOCK_BITS(inode->i_sb)) + 1;

}

fs/ext4/super.c

+18 −11
Original line number Diff line number Diff line
@@ -68,7 +68,21 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf); 
static int ext4_unfreeze(struct super_block *sb);

static void ext4_write_super(struct super_block *sb);

static int ext4_freeze(struct super_block *sb);

static int ext4_get_sb(struct file_system_type *fs_type, int flags,

		       const char *dev_name, void *data, struct vfsmount *mnt);



#if !defined(CONFIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)

static struct file_system_type ext3_fs_type = {

	.owner		= THIS_MODULE,

	.name		= "ext3",

	.get_sb		= ext4_get_sb,

	.kill_sb	= kill_block_super,

	.fs_flags	= FS_REQUIRES_DEV,

};

#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)

#else

#define IS_EXT3_SB(sb) (0)

#endif



ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,

			       struct ext4_group_desc *bg)
@@ -2539,6 +2553,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	 * enable delayed allocation by default

	 * Use -o nodelalloc to turn it off

	 */

	if (!IS_EXT3_SB(sb))

		set_opt(sbi->s_mount_opt, DELALLOC);



	if (!parse_options((char *) data, sb, &journal_devnum,
@@ -4068,7 +4083,7 @@ static int ext4_get_sb(struct file_system_type *fs_type, int flags, 
	return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);

}



#if !defined(CONTIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)

#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)

static struct file_system_type ext2_fs_type = {

	.owner		= THIS_MODULE,

	.name		= "ext2",
@@ -4095,15 +4110,7 @@ static inline void register_as_ext2(void) { } 
static inline void unregister_as_ext2(void) { }

#endif



#if !defined(CONTIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)

static struct file_system_type ext3_fs_type = {

	.owner		= THIS_MODULE,

	.name		= "ext3",

	.get_sb		= ext4_get_sb,

	.kill_sb	= kill_block_super,

	.fs_flags	= FS_REQUIRES_DEV,

};



#if !defined(CONFIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)

static inline void register_as_ext3(void)

{

	int err = register_filesystem(&ext3_fs_type);