summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@linux.intel.com>2010-12-06 08:02:36 +0100
committerChris Mason <chris.mason@oracle.com>2010-12-10 22:29:09 +0100
commit24ae63656a165c870c0d69fcc8aac1dc35e25e34 (patch)
tree8833bfeba51ef45e0acc42f3a23838f528e6a37e /fs/btrfs
parentBtrfs: do not BUG if we fail to remove the orphan item for dead snapshots (diff)
downloadlinux-24ae63656a165c870c0d69fcc8aac1dc35e25e34.tar.xz
linux-24ae63656a165c870c0d69fcc8aac1dc35e25e34.zip
Btrfs: Fix page leak in compressed writeback path
"start + num_bytes >= actual_end" can happen when compressed page writeback races with file truncation. In that case we need unlock and release pages past the end of file. Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ae6c0d190bc1..4875d69871b5 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -495,7 +495,7 @@ again:
add_async_extent(async_cow, start, num_bytes,
total_compressed, pages, nr_pages_ret);
- if (start + num_bytes < end && start + num_bytes < actual_end) {
+ if (start + num_bytes < end) {
start += num_bytes;
pages = NULL;
cond_resched();