Commit 684de574 authored Sep 11, 2014 by Darrick J. Wong Committed by Theodore Ts'o Sep 11, 2014

ext4: don't keep using page if inline conversion fails



If inline->extent conversion fails (most probably due to ENOSPC) and
we release the temporary page that we allocated to transfer the file
contents, don't keep using the page pointer after releasing the page.
This occasionally leads to complaints about evicting locked pages or
hangs when blocksize > pagesize, because it's possible for the page to
get reallocated elsewhere in the meantime.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Tao Ma <tm@tao.ma>

parent df4763be

fs/ext4/inline.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -594,6 +594,7 @@ retry:
		if (ret) {
		unlock_page(page);
		page_cache_release(page);
		page = NULL;
		ext4_orphan_add(handle, inode);
		up_write(&EXT4_I(inode)->xattr_sem);
		sem_held = 0;
		@@ -613,6 +614,7 @@ retry:
		if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
		goto retry;

		if (page)
		block_commit_write(page, from, to);
		out:
		if (page) {

Admin message