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

Commit ee265627 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: Update documentation to remind users to update mke2fs.conf
  ext4: Fix small file fragmentation
  ext4: Initialize writeback_index to 0 when allocating a new inode
  ext4: make sure ext4_has_free_blocks returns 0 for ENOSPC
  ext4: journal credit fix for the delayed allocation's writepages() function
  ext4: Rework the ext4_da_writepages() function
  ext4: journal credits reservation fixes for DIO, fallocate
  ext4: journal credits reservation fixes for extent file writepage
  ext4: journal credits calulation cleanup and fix for non-extent writepage
  ext4: Fix bug where we return ENOSPC even though we have plenty of inodes
  ext4: don't try to resize if there are no reserved gdt blocks left
  ext4: Use ext4_discard_reservations instead of mballoc-specific call
  ext4: Fix ext4_dx_readdir hash collision handling
  ext4: Fix delalloc release block reservation for truncate
  ext4: Fix potential truncate BUG due to i_prealloc_list being non-empty
  ext4: Handle unwritten extent properly with delayed allocation
parents 43cc071d 4537398d

Documentation/filesystems/ext4.txt

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org 


    git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git



  - Note that it is highly important to install the mke2fs.conf file

    that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If

    you have edited the /etc/mke2fs.conf file installed on your system,

    you will need to merge your changes with the version from e2fsprogs

    1.41.x.



  - Create a new filesystem using the ext4dev filesystem type:



    	# mke2fs -t ext4dev /dev/hda1

fs/ext4/balloc.c

+3 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,9 @@ ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, 
		free_blocks =

			percpu_counter_sum_and_set(&sbi->s_freeblocks_counter);

#endif

	if (free_blocks <= root_blocks)

		/* we don't have free space */

		return 0;

	if (free_blocks - root_blocks < nblocks)

		return free_blocks - root_blocks;

	return nblocks;

fs/ext4/dir.c

+15 −5
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int call_filldir(struct file * filp, void * dirent, 
				get_dtype(sb, fname->file_type));

		if (error) {

			filp->f_pos = curr_pos;

			info->extra_fname = fname->next;

			info->extra_fname = fname;

			return error;

		}

		fname = fname->next;
@@ -450,11 +450,21 @@ static int ext4_dx_readdir(struct file * filp, 
	 * If there are any leftover names on the hash collision

	 * chain, return them first.

	 */

	if (info->extra_fname &&

	    call_filldir(filp, dirent, filldir, info->extra_fname))

	if (info->extra_fname) {

		if (call_filldir(filp, dirent, filldir, info->extra_fname))

			goto finished;



	if (!info->curr_node)

		info->extra_fname = NULL;

		info->curr_node = rb_next(info->curr_node);

		if (!info->curr_node) {

			if (info->next_hash == ~0) {

				filp->f_pos = EXT4_HTREE_EOF;

				goto finished;

			}

			info->curr_hash = info->next_hash;

			info->curr_minor_hash = 0;

		}

	} else if (!info->curr_node)

		info->curr_node = rb_first(&info->root);



	while (1) {

fs/ext4/ext4.h

+4 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,8 @@ extern void ext4_set_inode_flags(struct inode *); 
extern void ext4_get_inode_flags(struct ext4_inode_info *);

extern void ext4_set_aops(struct inode *inode);

extern int ext4_writepage_trans_blocks(struct inode *);

extern int ext4_meta_trans_blocks(struct inode *, int nrblocks, int idxblocks);

extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);

extern int ext4_block_truncate_page(handle_t *handle,

		struct address_space *mapping, loff_t from);

extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
@@ -1227,6 +1229,8 @@ extern const struct inode_operations ext4_fast_symlink_inode_operations; 
/* extents.c */

extern int ext4_ext_tree_init(handle_t *handle, struct inode *);

extern int ext4_ext_writepage_trans_blocks(struct inode *, int);

extern int ext4_ext_index_trans_blocks(struct inode *inode, int nrblocks,

				       int chunk);

extern int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,

			ext4_lblk_t iblock,

			unsigned long max_blocks, struct buffer_head *bh_result,

fs/ext4/ext4_extents.h

+3 −1
Original line number Diff line number Diff line
@@ -216,7 +216,9 @@ extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks); 
extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *);

extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t);

extern int ext4_extent_tree_init(handle_t *, struct inode *);

extern int ext4_ext_calc_credits_for_insert(struct inode *, struct ext4_ext_path *);

extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,

						   int num,

						   struct ext4_ext_path *path);

extern int ext4_ext_try_to_merge(struct inode *inode,

				 struct ext4_ext_path *path,

				 struct ext4_extent *);