Commit 741ec653 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: subpage: make end_compressed_bio_writeback() compatible 



In end_compressed_writeback() we just clear the full page writeback.
For subpage case, if there are two delalloc ranges in the same page, the
2nd range will trigger a BUG_ON() as the page writeback is already
cleared by previous range.

Fix it by using btrfs_page_clamp_clear_writeback() helper.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bbbff01a

fs/btrfs/compression.c

+3 −1
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ static void end_compressed_bio_read(struct bio *bio) 
static noinline void end_compressed_writeback(struct inode *inode,

					      const struct compressed_bio *cb)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	unsigned long index = cb->start >> PAGE_SHIFT;

	unsigned long end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT;

	struct page *pages[16];
@@ -356,7 +357,8 @@ static noinline void end_compressed_writeback(struct inode *inode, 
		for (i = 0; i < ret; i++) {

			if (cb->errors)

				SetPageError(pages[i]);

			end_page_writeback(pages[i]);

			btrfs_page_clamp_clear_writeback(fs_info, pages[i],

							 cb->start, cb->len);

			put_page(pages[i]);

		}

		nr_pages -= ret;