From 70e810452eaa5c94b9de753a8f6662670b216d9f Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Wed, 5 Dec 2012 10:53:45 +0000 Subject: [PATCH] --- yaml --- r: 346729 b: refs/heads/master c: 6347b3c433a4cff00eb2299c7f2c7d1d8b24c1fc h: refs/heads/master i: 346727: 65caced43df005a7ae29326c7e57083ea86c496b v: v3 --- [refs] | 2 +- trunk/fs/btrfs/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 742b4b4ca089..0d6682f49b5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b5829a8e3104c8bc115d926a0285d3ff9bcfc77 +refs/heads/master: 6347b3c433a4cff00eb2299c7f2c7d1d8b24c1fc diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index 8e3d6788d6dd..d75412bf7c4a 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/fs/btrfs/file.c @@ -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);