Commit 1cf29683 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:
  jbd2: fix race between write_metadata_buffer and get_write_access
  ext4: Fix ext4_mb_initialize_context() to initialize all fields
  ext4: fix null handler of ioctls in no journal mode
  ext4: Fix buffer head reference leak in no-journal mode
  ext4: Move __ext4_journalled_writepage() to avoid forward declaration
  ext4: Fix mmap/truncate race when blocksize < pagesize && !nodellaoc
  ext4: Fix mmap/truncate race when blocksize < pagesize && delayed allocation
  ext4: Don't look at buffer_heads outside i_size.
  ext4: Fix goal inum check in the inode allocator
  ext4: fix no journal corruption with locale-gen
  ext4: Calculate required journal credits for inserting an extent properly
  ext4: Fix truncation of symlinks after failed write
  jbd2: Fix a race between checkpointing code and journal_get_write_access()
  ext4: Use rcu_barrier() on module unload.
  ext4: naturally align struct ext4_allocation_request
  ext4: mark several more functions in mballoc.c as noinline
  ext4: Fix potential reclaim deadlock when truncating partial block
  jbd2: Remove GFP_ATOMIC kmalloc from inside spinlock critical region
  ext4: Fix type warning on 64-bit platforms in tracing events header
parents 4a390e07 96577c43

fs/ext4/ext4.h

+7 −7
Original line number Diff line number Diff line
@@ -93,20 +93,20 @@ typedef unsigned int ext4_group_t; 
struct ext4_allocation_request {

	/* target inode for block we're allocating */

	struct inode *inode;

	/* how many blocks we want to allocate */

	unsigned int len;

	/* logical block in target inode */

	ext4_lblk_t logical;

	/* phys. target (a hint) */

	ext4_fsblk_t goal;

	/* the closest logical allocated block to the left */

	ext4_lblk_t lleft;

	/* phys. block for ^^^ */

	ext4_fsblk_t pleft;

	/* the closest logical allocated block to the right */

	ext4_lblk_t lright;

	/* phys. block for ^^^ */

	/* phys. target (a hint) */

	ext4_fsblk_t goal;

	/* phys. block for the closest logical allocated block to the left */

	ext4_fsblk_t pleft;

	/* phys. block for the closest logical allocated block to the right */

	ext4_fsblk_t pright;

	/* how many blocks we want to allocate */

	unsigned int len;

	/* flags. see above EXT4_MB_HINT_* */

	unsigned int flags;

};

fs/ext4/ext4_jbd2.c

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ int __ext4_journal_forget(const char *where, handle_t *handle, 
			ext4_journal_abort_handle(where, __func__, bh,

						  handle, err);

	}

	else

		brelse(bh);

	return err;

}
@@ -57,6 +59,8 @@ int __ext4_journal_revoke(const char *where, handle_t *handle, 
			ext4_journal_abort_handle(where, __func__, bh,

						  handle, err);

	}

	else

		brelse(bh);

	return err;

}

fs/ext4/ext4_jbd2.h

+4 −2
Original line number Diff line number Diff line
@@ -131,9 +131,11 @@ int __ext4_journal_get_undo_access(const char *where, handle_t *handle, 
int __ext4_journal_get_write_access(const char *where, handle_t *handle,

				struct buffer_head *bh);



/* When called with an invalid handle, this will still do a put on the BH */

int __ext4_journal_forget(const char *where, handle_t *handle,

				struct buffer_head *bh);



/* When called with an invalid handle, this will still do a put on the BH */

int __ext4_journal_revoke(const char *where, handle_t *handle,

				ext4_fsblk_t blocknr, struct buffer_head *bh);
@@ -281,10 +283,10 @@ static inline int ext4_should_order_data(struct inode *inode) 


static inline int ext4_should_writeback_data(struct inode *inode)

{

	if (EXT4_JOURNAL(inode) == NULL)

		return 0;

	if (!S_ISREG(inode->i_mode))

		return 0;

	if (EXT4_JOURNAL(inode) == NULL)

		return 1;

	if (EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL)

		return 0;

	if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)

fs/ext4/extents.c

+1 −0
Original line number Diff line number Diff line
@@ -1977,6 +1977,7 @@ int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int nrblocks, 
			 */

			/* 1 bitmap, 1 block group descriptor */

			ret = 2 + EXT4_META_TRANS_BLOCKS(inode->i_sb);

			return ret;

		}

	}

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode, 
	if (!goal)

		goal = sbi->s_inode_goal;



	if (goal && goal < le32_to_cpu(sbi->s_es->s_inodes_count)) {

	if (goal && goal <= le32_to_cpu(sbi->s_es->s_inodes_count)) {

		group = (goal - 1) / EXT4_INODES_PER_GROUP(sb);

		ino = (goal - 1) % EXT4_INODES_PER_GROUP(sb);

		ret2 = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE