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

Commit e984fd48 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:
  Define/reserve new ext4 superblock fields
  When ext4_ext_insert_extent() fails to insert new blocks
  ext4: Extent overlap bugfix
  Remove unnecessary exported symbols.
  EXT4: Fix whitespace
parents 184b812f 436bd75e

fs/ext4/extents.c

+100 −48
Original line number Diff line number Diff line
@@ -1127,6 +1127,55 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1, 
	return 0;

}



/*

 * check if a portion of the "newext" extent overlaps with an

 * existing extent.

 *

 * If there is an overlap discovered, it updates the length of the newext

 * such that there will be no overlap, and then returns 1.

 * If there is no overlap found, it returns 0.

 */

unsigned int ext4_ext_check_overlap(struct inode *inode,

				    struct ext4_extent *newext,

				    struct ext4_ext_path *path)

{

	unsigned long b1, b2;

	unsigned int depth, len1;

	unsigned int ret = 0;



	b1 = le32_to_cpu(newext->ee_block);

	len1 = le16_to_cpu(newext->ee_len);

	depth = ext_depth(inode);

	if (!path[depth].p_ext)

		goto out;

	b2 = le32_to_cpu(path[depth].p_ext->ee_block);



	/*

	 * get the next allocated block if the extent in the path

	 * is before the requested block(s) 

	 */

	if (b2 < b1) {

		b2 = ext4_ext_next_allocated_block(path);

		if (b2 == EXT_MAX_BLOCK)

			goto out;

	}



	/* check for wrap through zero */

	if (b1 + len1 < b1) {

		len1 = EXT_MAX_BLOCK - b1;

		newext->ee_len = cpu_to_le16(len1);

		ret = 1;

	}



	/* check for overlap */

	if (b1 + len1 > b2) {

		newext->ee_len = cpu_to_le16(b2 - b1);

		ret = 1;

	}

out:

	return ret;

}



/*

 * ext4_ext_insert_extent:

 * tries to merge requsted extent into the existing extent or
@@ -2031,6 +2080,14 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, 


	/* allocate new block */

	goal = ext4_ext_find_goal(inode, path, iblock);



	/* Check if we can really insert (iblock)::(iblock+max_blocks) extent */

	newex.ee_block = cpu_to_le32(iblock);

	newex.ee_len = cpu_to_le16(max_blocks);

	err = ext4_ext_check_overlap(inode, &newex, path);

	if (err)

		allocated = le16_to_cpu(newex.ee_len);

	else

		allocated = max_blocks;

	newblock = ext4_new_blocks(handle, inode, goal, &allocated, &err);

	if (!newblock)
@@ -2039,12 +2096,15 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, 
			goal, newblock, allocated);



	/* try to insert new extent into found leaf and return */

	newex.ee_block = cpu_to_le32(iblock);

	ext4_ext_store_pblock(&newex, newblock);

	newex.ee_len = cpu_to_le16(allocated);

	err = ext4_ext_insert_extent(handle, inode, path, &newex);

	if (err)

	if (err) {

		/* free data blocks we just allocated */

		ext4_free_blocks(handle, inode, ext_pblock(&newex),

					le16_to_cpu(newex.ee_len));

		goto out2;

	}



	if (extend_disksize && inode->i_size > EXT4_I(inode)->i_disksize)

		EXT4_I(inode)->i_disksize = inode->i_size;
@@ -2157,11 +2217,3 @@ int ext4_ext_writepage_trans_blocks(struct inode *inode, int num) 


	return needed;

}
 


EXPORT_SYMBOL(ext4_mark_inode_dirty);

EXPORT_SYMBOL(ext4_ext_invalidate_cache);

EXPORT_SYMBOL(ext4_ext_insert_extent);

EXPORT_SYMBOL(ext4_ext_walk_space);

EXPORT_SYMBOL(ext4_ext_find_goal);

EXPORT_SYMBOL(ext4_ext_calc_credits_for_insert);

include/linux/ext4_fs.h

+20 −13
Original line number Diff line number Diff line
@@ -513,7 +513,14 @@ struct ext4_super_block { 
/*150*/	__le32	s_blocks_count_hi;	/* Blocks count */

	__le32	s_r_blocks_count_hi;	/* Reserved blocks count */

	__le32	s_free_blocks_count_hi;	/* Free blocks count */

	__u32	s_reserved[169];	/* Padding to the end of the block */

	__u16	s_min_extra_isize;	/* All inodes have at least # bytes */

	__u16	s_want_extra_isize; 	/* New inodes should reserve # bytes */

	__u32	s_flags;		/* Miscellaneous flags */

	__u16   s_raid_stride;		/* RAID stride */

	__u16   s_mmp_interval;         /* # seconds to wait in MMP checking */

	__u64   s_mmp_block;            /* Block for multi-mount protection */

	__u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/

	__u32   s_reserved[163];        /* Padding to the end of the block */

};



#ifdef __KERNEL__

include/linux/ext4_fs_extents.h

+3 −2
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ ext4_ext_invalidate_cache(struct inode *inode) 


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 unsigned int ext4_ext_check_overlap(struct inode *, struct ext4_extent *, struct ext4_ext_path *);

extern int ext4_ext_insert_extent(handle_t *, struct inode *, struct ext4_ext_path *, struct ext4_extent *);

extern int ext4_ext_walk_space(struct inode *, unsigned long, unsigned long, ext_prepare_callback, void *);

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

fs/ext4/super.c

+1 −1

File changed.

Contains only whitespace changes.

include/linux/ext4_fs_i.h

+3 −3

File changed.

Contains only whitespace changes.

fs/ext4/balloc.c

+3 −3

File changed.

Contains only whitespace changes.

fs/ext4/inode.c

+2 −2

File changed.

Contains only whitespace changes.

fs/ext4/namei.c

+2 −2

File changed.

Contains only whitespace changes.