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

Commit e893123c 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: (49 commits)
  ext4: Avoid corrupting the uninitialized bit in the extent during truncate
  ext4: Don't treat a truncation of a zero-length file as replace-via-truncate
  ext4: fix dx_map_entry to support 256k directory blocks
  ext4: truncate the file properly if we fail to copy data from userspace
  ext4: Avoid leaking blocks after a block allocation failure
  ext4: Change all super.c messages to print the device
  ext4: Get rid of EXTEND_DISKSIZE flag of ext4_get_blocks_handle()
  ext4: super.c whitespace cleanup
  jbd2: Fix minor typos in comments in fs/jbd2/journal.c
  ext4: Clean up calls to ext4_get_group_desc()
  ext4: remove unused function __ext4_write_dirty_metadata
  ext2: Fix memory leak in ext2_fill_super() in case of a failed mount
  ext3: Fix memory leak in ext3_fill_super() in case of a failed mount
  ext4: Fix memory leak in ext4_fill_super() in case of a failed mount
  ext4: down i_data_sem only for read when walking tree for fiemap
  ext4: Add a comprehensive block validity check to ext4_get_blocks()
  ext4: Clean up ext4_get_blocks() so it does not depend on bh_result->b_state
  ext4: Merge ext4_da_get_block_write() into mpage_da_map_blocks()
  ext4: Add BUG_ON debugging checks to noalloc_get_block_write()
  ext4: Add documentation to the ext4_*get_block* functions
  ...
parents 27951daa a41f2071

fs/buffer.c

+2 −0
Original line number Diff line number Diff line
@@ -2935,6 +2935,8 @@ int submit_bh(int rw, struct buffer_head * bh) 
	BUG_ON(!buffer_locked(bh));

	BUG_ON(!buffer_mapped(bh));

	BUG_ON(!bh->b_end_io);

	BUG_ON(buffer_delay(bh));

	BUG_ON(buffer_unwritten(bh));



	/*

	 * Mask in barrier bit for a write (could be either a WRITE or a

fs/ext2/super.c

+1 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	brelse(bh);

failed_sbi:

	sb->s_fs_info = NULL;

	kfree(sbi->s_blockgroup_lock);

	kfree(sbi);

	return ret;

}

fs/ext3/super.c

+1 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	brelse(bh);

out_fail:

	sb->s_fs_info = NULL;

	kfree(sbi->s_blockgroup_lock);

	kfree(sbi);

	lock_kernel();

	return ret;

fs/ext4/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT4_FS) += ext4.o 


ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		   ext4_jbd2.o migrate.o mballoc.o

		ext4_jbd2.o migrate.o mballoc.o block_validity.o



ext4-$(CONFIG_EXT4_FS_XATTR)		+= xattr.o xattr_user.o xattr_trusted.o

ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

fs/ext4/balloc.c

+13 −15
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/buffer_head.h>

#include "ext4.h"

#include "ext4_jbd2.h"

#include "group.h"

#include "mballoc.h"



/*
@@ -88,6 +87,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		 ext4_group_t block_group, struct ext4_group_desc *gdp)

{

	int bit, bit_max;

	ext4_group_t ngroups = ext4_get_groups_count(sb);

	unsigned free_blocks, group_blocks;

	struct ext4_sb_info *sbi = EXT4_SB(sb);
@@ -123,7 +123,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		bit_max += ext4_bg_num_gdb(sb, block_group);

	}



	if (block_group == sbi->s_groups_count - 1) {

	if (block_group == ngroups - 1) {

		/*

		 * Even though mke2fs always initialize first and last group

		 * if some other tool enabled the EXT4_BG_BLOCK_UNINIT we need
@@ -131,7 +131,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		 */

		group_blocks = ext4_blocks_count(sbi->s_es) -

			le32_to_cpu(sbi->s_es->s_first_data_block) -

			(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count - 1));

			(EXT4_BLOCKS_PER_GROUP(sb) * (ngroups - 1));

	} else {

		group_blocks = EXT4_BLOCKS_PER_GROUP(sb);

	}
@@ -205,18 +205,18 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, 
{

	unsigned int group_desc;

	unsigned int offset;

	ext4_group_t ngroups = ext4_get_groups_count(sb);

	struct ext4_group_desc *desc;

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (block_group >= sbi->s_groups_count) {

	if (block_group >= ngroups) {

		ext4_error(sb, "ext4_get_group_desc",

			   "block_group >= groups_count - "

			   "block_group = %u, groups_count = %u",

			   block_group, sbi->s_groups_count);

			   block_group, ngroups);



		return NULL;

	}

	smp_rmb();



	group_desc = block_group >> EXT4_DESC_PER_BLOCK_BITS(sb);

	offset = block_group & (EXT4_DESC_PER_BLOCK(sb) - 1);
@@ -326,16 +326,16 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
		unlock_buffer(bh);

		return bh;

	}

	spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));

	ext4_lock_group(sb, block_group);

	if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {

		ext4_init_block_bitmap(sb, bh, block_group, desc);

		set_bitmap_uptodate(bh);

		set_buffer_uptodate(bh);

		spin_unlock(sb_bgl_lock(EXT4_SB(sb), block_group));

		ext4_unlock_group(sb, block_group);

		unlock_buffer(bh);

		return bh;

	}

	spin_unlock(sb_bgl_lock(EXT4_SB(sb), block_group));

	ext4_unlock_group(sb, block_group);

	if (buffer_uptodate(bh)) {

		/*

		 * if not uninit if bh is uptodate,
@@ -451,7 +451,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
	down_write(&grp->alloc_sem);

	for (i = 0, blocks_freed = 0; i < count; i++) {

		BUFFER_TRACE(bitmap_bh, "clear bit");

		if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group),

		if (!ext4_clear_bit_atomic(ext4_group_lock_ptr(sb, block_group),

						bit + i, bitmap_bh->b_data)) {

			ext4_error(sb, __func__,

				   "bit already cleared for block %llu",
@@ -461,11 +461,11 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
			blocks_freed++;

		}

	}

	spin_lock(sb_bgl_lock(sbi, block_group));

	ext4_lock_group(sb, block_group);

	blk_free_count = blocks_freed + ext4_free_blks_count(sb, desc);

	ext4_free_blks_set(sb, desc, blk_free_count);

	desc->bg_checksum = ext4_group_desc_csum(sbi, block_group, desc);

	spin_unlock(sb_bgl_lock(sbi, block_group));

	ext4_unlock_group(sb, block_group);

	percpu_counter_add(&sbi->s_freeblocks_counter, blocks_freed);



	if (sbi->s_log_groups_per_flex) {
@@ -665,7 +665,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) 
	ext4_fsblk_t desc_count;

	struct ext4_group_desc *gdp;

	ext4_group_t i;

	ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count;

	ext4_group_t ngroups = ext4_get_groups_count(sb);

#ifdef EXT4FS_DEBUG

	struct ext4_super_block *es;

	ext4_fsblk_t bitmap_count;
@@ -677,7 +677,6 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) 
	bitmap_count = 0;

	gdp = NULL;



	smp_rmb();

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

		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)
@@ -700,7 +699,6 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) 
	return bitmap_count;

#else

	desc_count = 0;

	smp_rmb();

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

		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)