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

Commit 6347b3c4 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: fix off-by-one error of the same page check in btrfs_punch_hole() 



(start + len) is the start of the adjacent extent, not the end of the current
extent, so we should not use it to check the hole is on the same page or not.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 4b5829a8

fs/btrfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1867,8 +1867,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
	u64 drop_end;

	int ret = 0;

	int err = 0;

	bool same_page = (offset >> PAGE_CACHE_SHIFT) ==

		((offset + len) >> PAGE_CACHE_SHIFT);

	bool same_page = ((offset >> PAGE_CACHE_SHIFT) ==

			  ((offset + len - 1) >> PAGE_CACHE_SHIFT));



	btrfs_wait_ordered_range(inode, offset, len);