Commit 7333ed35 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

ext4: Allow GFP_FS allocations in ext4_da_convert_inline_data_to_extent() 



Since commit 8bc1379b, the transaction is stopped before calling
ext4_da_convert_inline_data_to_extent(), which means we can do GFP_FS
allocations and recurse into the filesystem.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent df808180

fs/ext4/inline.c

+1 −3
Original line number Diff line number Diff line
@@ -848,13 +848,12 @@ ext4_journalled_write_inline_data(struct inode *inode, 
 */

static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,

						 struct inode *inode,

						 unsigned flags,

						 void **fsdata)

{

	int ret = 0, inline_size;

	struct page *page;



	page = grab_cache_page_write_begin(mapping, 0, flags);

	page = grab_cache_page_write_begin(mapping, 0, 0);

	if (!page)

		return -ENOMEM;
@@ -942,7 +941,6 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping, 
		ext4_journal_stop(handle);

		ret = ext4_da_convert_inline_data_to_extent(mapping,

							    inode,

							    flags,

							    fsdata);

		if (ret == -ENOSPC &&

		    ext4_should_retry_alloc(inode->i_sb, &retries))