diff --git a/[refs] b/[refs] index bb19c656400d..8e7738f46012 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84cd948cb11041f205242de457e680b9bb872a36 +refs/heads/master: 24ae63656a165c870c0d69fcc8aac1dc35e25e34 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index ae6c0d190bc1..4875d69871b5 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -495,7 +495,7 @@ static noinline int compress_file_range(struct inode *inode, 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();