Commit b973425c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 update from Ted Ts'o:
 "Fixed regressions (two stability regressions and a performance
  regression) introduced during the 3.10-rc1 merge window.

  Also included is a bug fix relating to allocating blocks after
  resizing an ext3 file system when using the ext4 file system driver"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd,jbd2: fix oops in jbd2_journal_put_journal_head()
  ext4: revert "ext4: use io_end for multiple bios"
  ext4: limit group search loop for non-extent files
  ext4: fix fio regression
parents 7fb30d2b e2555fde

fs/ext4/ext4.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -209,7 +209,6 @@ typedef struct ext4_io_end { 
	ssize_t			size;		/* size of the extent */

	ssize_t			size;		/* size of the extent */

	struct kiocb		*iocb;		/* iocb struct for AIO */

	struct kiocb		*iocb;		/* iocb struct for AIO */

	int			result;		/* error value for AIO */

	int			result;		/* error value for AIO */

	atomic_t		count;		/* reference counter */

} ext4_io_end_t;

} ext4_io_end_t;





struct ext4_io_submit {

struct ext4_io_submit {
@@ -2651,14 +2650,11 @@ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, 




/* page-io.c */

/* page-io.c */

extern int __init ext4_init_pageio(void);

extern int __init ext4_init_pageio(void);

extern void ext4_add_complete_io(ext4_io_end_t *io_end);

extern void ext4_exit_pageio(void);

extern void ext4_exit_pageio(void);

extern void ext4_ioend_shutdown(struct inode *);

extern void ext4_ioend_shutdown(struct inode *);

extern void ext4_free_io_end(ext4_io_end_t *io);

extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags);

extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags);

extern ext4_io_end_t *ext4_get_io_end(ext4_io_end_t *io_end);

extern int ext4_put_io_end(ext4_io_end_t *io_end);

extern void ext4_put_io_end_defer(ext4_io_end_t *io_end);

extern void ext4_io_submit_init(struct ext4_io_submit *io,

				struct writeback_control *wbc);

extern void ext4_end_io_work(struct work_struct *work);

extern void ext4_end_io_work(struct work_struct *work);

extern void ext4_io_submit(struct ext4_io_submit *io);

extern void ext4_io_submit(struct ext4_io_submit *io);

extern int ext4_bio_write_page(struct ext4_io_submit *io,

extern int ext4_bio_write_page(struct ext4_io_submit *io,

fs/ext4/extents.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -3642,7 +3642,7 @@ int ext4_find_delalloc_range(struct inode *inode, 
{

{

	struct extent_status es;

	struct extent_status es;





	ext4_es_find_delayed_extent(inode, lblk_start, &es);

	ext4_es_find_delayed_extent_range(inode, lblk_start, lblk_end, &es);

	if (es.es_len == 0)

	if (es.es_len == 0)

		return 0; /* there is no delay extent in this tree */

		return 0; /* there is no delay extent in this tree */

	else if (es.es_lblk <= lblk_start &&

	else if (es.es_lblk <= lblk_start &&
@@ -4608,9 +4608,10 @@ static int ext4_find_delayed_extent(struct inode *inode, 
	struct extent_status es;

	struct extent_status es;

	ext4_lblk_t block, next_del;

	ext4_lblk_t block, next_del;





	ext4_es_find_delayed_extent(inode, newes->es_lblk, &es);



	if (newes->es_pblk == 0) {

	if (newes->es_pblk == 0) {

		ext4_es_find_delayed_extent_range(inode, newes->es_lblk,

				newes->es_lblk + newes->es_len - 1, &es);



		/*

		/*

		 * No extent in extent-tree contains block @newes->es_pblk,

		 * No extent in extent-tree contains block @newes->es_pblk,

		 * then the block may stay in 1)a hole or 2)delayed-extent.

		 * then the block may stay in 1)a hole or 2)delayed-extent.
@@ -4630,7 +4631,7 @@ static int ext4_find_delayed_extent(struct inode *inode, 
	}

	}





	block = newes->es_lblk + newes->es_len;

	block = newes->es_lblk + newes->es_len;

	ext4_es_find_delayed_extent(inode, block, &es);

	ext4_es_find_delayed_extent_range(inode, block, EXT_MAX_BLOCKS, &es);

	if (es.es_len == 0)

	if (es.es_len == 0)

		next_del = EXT_MAX_BLOCKS;

		next_del = EXT_MAX_BLOCKS;

	else

	else

fs/ext4/extents_status.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -232,14 +232,16 @@ static struct extent_status *__es_tree_search(struct rb_root *root, 
}

}





/*

/*

 * ext4_es_find_delayed_extent: find the 1st delayed extent covering @es->lblk

 * ext4_es_find_delayed_extent_range: find the 1st delayed extent covering

 * if it exists, otherwise, the next extent after @es->lblk.

 * @es->lblk if it exists, otherwise, the next extent after @es->lblk.

 *

 *

 * @inode: the inode which owns delayed extents

 * @inode: the inode which owns delayed extents

 * @lblk: the offset where we start to search

 * @lblk: the offset where we start to search

 * @end: the offset where we stop to search

 * @es: delayed extent that we found

 * @es: delayed extent that we found

 */

 */

void ext4_es_find_delayed_extent(struct inode *inode, ext4_lblk_t lblk,

void ext4_es_find_delayed_extent_range(struct inode *inode,

				 ext4_lblk_t lblk, ext4_lblk_t end,

				 struct extent_status *es)

				 struct extent_status *es)

{

{

	struct ext4_es_tree *tree = NULL;

	struct ext4_es_tree *tree = NULL;
@@ -247,7 +249,8 @@ void ext4_es_find_delayed_extent(struct inode *inode, ext4_lblk_t lblk, 
	struct rb_node *node;

	struct rb_node *node;





	BUG_ON(es == NULL);

	BUG_ON(es == NULL);

	trace_ext4_es_find_delayed_extent_enter(inode, lblk);

	BUG_ON(end < lblk);

	trace_ext4_es_find_delayed_extent_range_enter(inode, lblk);





	read_lock(&EXT4_I(inode)->i_es_lock);

	read_lock(&EXT4_I(inode)->i_es_lock);

	tree = &EXT4_I(inode)->i_es_tree;

	tree = &EXT4_I(inode)->i_es_tree;
@@ -270,6 +273,10 @@ out: 
	if (es1 && !ext4_es_is_delayed(es1)) {

	if (es1 && !ext4_es_is_delayed(es1)) {

		while ((node = rb_next(&es1->rb_node)) != NULL) {

		while ((node = rb_next(&es1->rb_node)) != NULL) {

			es1 = rb_entry(node, struct extent_status, rb_node);

			es1 = rb_entry(node, struct extent_status, rb_node);

			if (es1->es_lblk > end) {

				es1 = NULL;

				break;

			}

			if (ext4_es_is_delayed(es1))

			if (ext4_es_is_delayed(es1))

				break;

				break;

		}

		}
@@ -285,7 +292,7 @@ out: 
	read_unlock(&EXT4_I(inode)->i_es_lock);

	read_unlock(&EXT4_I(inode)->i_es_lock);





	ext4_es_lru_add(inode);

	ext4_es_lru_add(inode);

	trace_ext4_es_find_delayed_extent_exit(inode, es);

	trace_ext4_es_find_delayed_extent_range_exit(inode, es);

}

}





static struct extent_status *

static struct extent_status *

fs/ext4/extents_status.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 
				 unsigned long long status);

				 unsigned long long status);

extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk,

extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk,

				 ext4_lblk_t len);

				 ext4_lblk_t len);

extern void ext4_es_find_delayed_extent(struct inode *inode, ext4_lblk_t lblk,

extern void ext4_es_find_delayed_extent_range(struct inode *inode,

					ext4_lblk_t lblk, ext4_lblk_t end,

					struct extent_status *es);

					struct extent_status *es);

extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,

extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,

				 struct extent_status *es);

				 struct extent_status *es);

fs/ext4/file.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -465,7 +465,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) 
		 * If there is a delay extent at this offset,

		 * If there is a delay extent at this offset,

		 * it will be as a data.

		 * it will be as a data.

		 */

		 */

		ext4_es_find_delayed_extent(inode, last, &es);

		ext4_es_find_delayed_extent_range(inode, last, last, &es);

		if (es.es_len != 0 && in_range(last, es.es_lblk, es.es_len)) {

		if (es.es_len != 0 && in_range(last, es.es_lblk, es.es_len)) {

			if (last != start)

			if (last != start)

				dataoff = last << blkbits;

				dataoff = last << blkbits;
@@ -548,7 +548,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) 
		 * If there is a delay extent at this offset,

		 * If there is a delay extent at this offset,

		 * we will skip this extent.

		 * we will skip this extent.

		 */

		 */

		ext4_es_find_delayed_extent(inode, last, &es);

		ext4_es_find_delayed_extent_range(inode, last, last, &es);

		if (es.es_len != 0 && in_range(last, es.es_lblk, es.es_len)) {

		if (es.es_len != 0 && in_range(last, es.es_lblk, es.es_len)) {

			last = es.es_lblk + es.es_len;

			last = es.es_lblk + es.es_len;

			holeoff = last << blkbits;

			holeoff = last << blkbits;

CRA Git | Maintained and supported by SUSTech CRA and CCSE