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

Commit 39be25cd authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Use invalidatepage when writepage finds a page outside of i_size 



With all the recent fixes to the delalloc locking, it is now safe
again to use invalidatepage inside the writepage code for
pages outside of i_size.  This used to deadlock against some of the
code to write locked ranges of pages, but all of that has been fixed.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent f5a31e16

fs/btrfs/extent_io.c

+1 −5
Original line number Diff line number Diff line
@@ -2174,11 +2174,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 
	pg_offset = i_size & (PAGE_CACHE_SIZE - 1);

	if (page->index > end_index ||

	   (page->index == end_index && !pg_offset)) {

		if (epd->extent_locked) {

			if (tree->ops && tree->ops->writepage_end_io_hook)

				tree->ops->writepage_end_io_hook(page, start,

							 page_end, NULL, 1);

		}

		page->mapping->a_ops->invalidatepage(page, 0);

		unlock_page(page);

		return 0;

	}

fs/btrfs/file-item.c

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ int btrfs_lookup_bio_sums(struct btrfs_root *root, struct inode *inode, 
				       "%llu\n", inode->i_ino,

				       (unsigned long long)offset);

				item = NULL;

				btrfs_release_path(root, path);

				goto found;

			}

			btrfs_item_key_to_cpu(path->nodes[0], &found_key,