Commit 4daa0682 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: Fix deadlock in ext4_write_begin() and ext4_da_write_begin()
  ext4: Add fallback for find_group_flex
parents f7e603ad ebd3610b

fs/ext4/ialloc.c

+7 −0
Original line number Diff line number Diff line
@@ -715,6 +715,13 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode) 


	if (sbi->s_log_groups_per_flex) {

		ret2 = find_group_flex(sb, dir, &group);

		if (ret2 == -1) {

			ret2 = find_group_other(sb, dir, &group);

			if (ret2 == 0 && printk_ratelimit())

				printk(KERN_NOTICE "ext4: find_group_flex "

				       "failed, fallback succeeded dir %lu\n",

				       dir->i_ino);

		}

		goto got_group;

	}

fs/ext4/inode.c

+8 −1
Original line number Diff line number Diff line
@@ -1368,6 +1368,10 @@ retry: 
		goto out;

	}



	/* We cannot recurse into the filesystem as the transaction is already

	 * started */

	flags |= AOP_FLAG_NOFS;



	page = grab_cache_page_write_begin(mapping, index, flags);

	if (!page) {

		ext4_journal_stop(handle);
@@ -2667,6 +2671,9 @@ retry: 
		ret = PTR_ERR(handle);

		goto out;

	}

	/* We cannot recurse into the filesystem as the transaction is already

	 * started */

	flags |= AOP_FLAG_NOFS;



	page = grab_cache_page_write_begin(mapping, index, flags);

	if (!page) {