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

Commit 5cc28a9e authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: prevent fsreentrance deadlock for inline_data 



ext4_da_convert_inline_data_to_extent() invokes
grab_cache_page_write_begin().  grab_cache_page_write_begin performs
memory allocation, so fs-reentrance should be prohibited because we
are inside journal transaction.

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent d4f76107

fs/ext4/inline.c

+6 −5
Original line number Diff line number Diff line
@@ -870,6 +870,12 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping, 
			goto out_journal;

	}



	/*

	 * We cannot recurse into the filesystem as the transaction

	 * is already started.

	 */

	flags |= AOP_FLAG_NOFS;



	if (ret == -ENOSPC) {

		ret = ext4_da_convert_inline_data_to_extent(mapping,

							    inode,
@@ -882,11 +888,6 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping, 
		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, 0, flags);

	if (!page) {