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

Commit 4515c306 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: (47 commits)
  ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem)
  ext4: Do not override ext2 or ext3 if built they are built as modules
  jbd2: Export jbd2_log_start_commit to fix ext4 build
  ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT
  ext4: Wait for proper transaction commit on fsync
  ext4: fix incorrect block reservation on quota transfer.
  ext4: quota macros cleanup
  ext4: ext4_get_reserved_space() must return bytes instead of blocks
  ext4: remove blocks from inode prealloc list on failure
  ext4: wait for log to commit when umounting
  ext4: Avoid data / filesystem corruption when write fails to copy data
  ext4: Use ext4 file system driver for ext2/ext3 file system mounts
  ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks()
  jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
  ext4: remove unused parameter wbc from __ext4_journalled_writepage()
  ext4: remove encountered_congestion trace
  ext4: move_extent_per_page() cleanup
  ext4: initialize moved_len before calling ext4_move_extents()
  ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT
  ext4: use ext4_data_block_valid() in ext4_free_blocks()
  ...
parents a5eba3f6 fab3a549

Documentation/filesystems/ext4.txt

+8 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ journal_dev=devnum When the external journal device's major/minor numbers 
			identified through its new major/minor numbers encoded

			in devnum.



noload			Don't load the journal on mounting.  Note that

                     	if the filesystem was not unmounted cleanly,

norecovery		Don't load the journal on mounting.  Note that

noload			if the filesystem was not unmounted cleanly,

                     	skipping the journal replay will lead to the

                     	filesystem containing inconsistencies that can

                     	lead to any number of problems.
@@ -353,6 +353,12 @@ noauto_da_alloc replacing existing files via patterns such as 
			system crashes before the delayed allocation

			blocks are forced to disk.



discard		Controls whether ext4 should issue discard/TRIM

nodiscard(*)		commands to the underlying block device when

			blocks are freed.  This is useful for SSD devices

			and sparse/thinly-provisioned LUNs, but it is off

			by default until sufficient testing has been done.



Data Mode

=========

There are 3 different data modes:

fs/ext4/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,16 @@ config EXT4_FS 


	  If unsure, say N.



config EXT4_USE_FOR_EXT23

	bool "Use ext4 for ext2/ext3 file systems"

	depends on EXT3_FS=n || EXT2_FS=n

	default y

	help

	  Allow the ext4 file system driver code to be used for ext2 or

	  ext3 file system mounts.  This allows users to reduce their

	  compiled kernel size by using one file system driver for

	  ext2, ext3, and ext4 file systems.



config EXT4_FS_XATTR

	bool "Ext4 extended attributes"

	depends on EXT4_FS

fs/ext4/balloc.c

+7 −39
Original line number Diff line number Diff line
@@ -498,44 +498,6 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
	return;

}



/**

 * ext4_free_blocks() -- Free given blocks and update quota

 * @handle:		handle for this transaction

 * @inode:		inode

 * @block:		start physical block to free

 * @count:		number of blocks to count

 * @metadata: 		Are these metadata blocks

 */

void ext4_free_blocks(handle_t *handle, struct inode *inode,

			ext4_fsblk_t block, unsigned long count,

			int metadata)

{

	struct super_block *sb;

	unsigned long dquot_freed_blocks;



	/* this isn't the right place to decide whether block is metadata

	 * inode.c/extents.c knows better, but for safety ... */

	if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))

		metadata = 1;



	/* We need to make sure we don't reuse

	 * block released untill the transaction commit.

	 * writeback mode have weak data consistency so

	 * don't force data as metadata when freeing block

	 * for writeback mode.

	 */

	if (metadata == 0 && !ext4_should_writeback_data(inode))

		metadata = 1;



	sb = inode->i_sb;



	ext4_mb_free_blocks(handle, inode, block, count,

			    metadata, &dquot_freed_blocks);

	if (dquot_freed_blocks)

		vfs_dq_free_block(inode, dquot_freed_blocks);

	return;

}



/**

 * ext4_has_free_blocks()

 * @sbi:	in-core super block structure.
@@ -761,7 +723,13 @@ static unsigned long ext4_bg_num_gdb_meta(struct super_block *sb, 
static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,

					ext4_group_t group)

{

	return ext4_bg_has_super(sb, group) ? EXT4_SB(sb)->s_gdb_count : 0;

	if (!ext4_bg_has_super(sb, group))

		return 0;



	if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG))

		return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);

	else

		return EXT4_SB(sb)->s_gdb_count;

}



/**

fs/ext4/block_validity.c

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int ext4_setup_system_zone(struct super_block *sb) 
		if (ext4_bg_has_super(sb, i) &&

		    ((i < 5) || ((i % flex_size) == 0)))

			add_system_zone(sbi, ext4_group_first_block_no(sb, i),

					sbi->s_gdb_count + 1);

					ext4_bg_num_gdb(sb, i) + 1);

		gdp = ext4_get_group_desc(sb, i, NULL);

		ret = add_system_zone(sbi, ext4_block_bitmap(sb, gdp), 1);

		if (ret)
@@ -228,6 +228,7 @@ int ext4_data_block_valid(struct ext4_sb_info *sbi, ext4_fsblk_t start_blk, 
	struct rb_node *n = sbi->system_blks.rb_node;



	if ((start_blk <= le32_to_cpu(sbi->s_es->s_first_data_block)) ||

	    (start_blk + count < start_blk) ||

	    (start_blk + count > ext4_blocks_count(sbi->s_es)))

		return 0;

	while (n) {

fs/ext4/ext4.h

+17 −6
Original line number Diff line number Diff line
@@ -375,6 +375,12 @@ struct ext4_new_group_data { 
#define EXT4_GET_BLOCKS_DIO_CONVERT_EXT		(EXT4_GET_BLOCKS_CONVERT|\

					 EXT4_GET_BLOCKS_DIO_CREATE_EXT)



/*

 * Flags used by ext4_free_blocks

 */

#define EXT4_FREE_BLOCKS_METADATA	0x0001

#define EXT4_FREE_BLOCKS_FORGET		0x0002



/*

 * ioctl commands

 */
@@ -703,6 +709,13 @@ struct ext4_inode_info { 
	struct list_head i_aio_dio_complete_list;

	/* current io_end structure for async DIO write*/

	ext4_io_end_t *cur_aio_dio;



	/*

	 * Transactions that contain inode's metadata needed to complete

	 * fsync and fdatasync, respectively.

	 */

	tid_t i_sync_tid;

	tid_t i_datasync_tid;

};



/*
@@ -750,6 +763,7 @@ struct ext4_inode_info { 
#define EXT4_MOUNT_DELALLOC		0x8000000 /* Delalloc support */

#define EXT4_MOUNT_DATA_ERR_ABORT	0x10000000 /* Abort on file data write */

#define EXT4_MOUNT_BLOCK_VALIDITY	0x20000000 /* Block validity checking */

#define EXT4_MOUNT_DISCARD		0x40000000 /* Issue DISCARD requests */



#define clear_opt(o, opt)		o &= ~EXT4_MOUNT_##opt

#define set_opt(o, opt)			o |= EXT4_MOUNT_##opt
@@ -1324,8 +1338,6 @@ extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, 
			ext4_fsblk_t goal, unsigned long *count, int *errp);

extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi, s64 nblocks);

extern int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks);

extern void ext4_free_blocks(handle_t *handle, struct inode *inode,

			ext4_fsblk_t block, unsigned long count, int metadata);

extern void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,

				ext4_fsblk_t block, unsigned long count);

extern ext4_fsblk_t ext4_count_free_blocks(struct super_block *);
@@ -1384,16 +1396,15 @@ extern int ext4_mb_reserve_blocks(struct super_block *, int); 
extern void ext4_discard_preallocations(struct inode *);

extern int __init init_ext4_mballoc(void);

extern void exit_ext4_mballoc(void);

extern void ext4_mb_free_blocks(handle_t *, struct inode *,

		ext4_fsblk_t, unsigned long, int, unsigned long *);

extern void ext4_free_blocks(handle_t *handle, struct inode *inode,

			     struct buffer_head *bh, ext4_fsblk_t block,

			     unsigned long count, int flags);

extern int ext4_mb_add_groupinfo(struct super_block *sb,

		ext4_group_t i, struct ext4_group_desc *desc);

extern int ext4_mb_get_buddy_cache_lock(struct super_block *, ext4_group_t);

extern void ext4_mb_put_buddy_cache_lock(struct super_block *,

						ext4_group_t, int);

/* inode.c */

int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode,

		struct buffer_head *bh, ext4_fsblk_t blocknr);

struct buffer_head *ext4_getblk(handle_t *, struct inode *,

						ext4_lblk_t, int, int *);

struct buffer_head *ext4_bread(handle_t *, struct inode *,