From patchwork Tue Nov 19 16:19:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3203241 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 877ADC045B for ; Tue, 19 Nov 2013 16:19:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6EC8620328 for ; Tue, 19 Nov 2013 16:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27B932030E for ; Tue, 19 Nov 2013 16:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752864Ab3KSQTn (ORCPT ); Tue, 19 Nov 2013 11:19:43 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:57054 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431Ab3KSQTn (ORCPT ); Tue, 19 Nov 2013 11:19:43 -0500 Received: by mail-wi0-f179.google.com with SMTP id fb10so5713694wid.6 for ; Tue, 19 Nov 2013 08:19:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=m5Yvp6d+rDXFLtIruGzWuN1yCwblzmBK8zbnhv1brp4=; b=hR46mSReOJ48sM+OkE1z1qvoRdMvczB0qr5uLvj6j5aT9K0kdyJYEFRIiIcZu6MoxQ VMyeZp+r/H6DjdgAegluTFGCKvU0hyv/YlUDEb2wY8ihj0FSuWBBo+NhIVX8J95/5ydH LlRisW3tDEKBYaeZMsWOhAlF5lifPbvhqZEiHU9YG2i6qgBERwsl6a721b98pbDBe6UI XBvny6xLs6IA1ryaGobwQXT+vhATuo0FVHnFxCi2aP3HuCd+Kwl/10nhHmq0T0p+xM92 GZ9bVngz4TY2dUjwKPEmVNmAbE6XdVKXC7MxVZxc+HZkPZ4qO1Qt/UV5X9WuMrTO3jSh OK4Q== X-Received: by 10.180.185.179 with SMTP id fd19mr21475123wic.18.1384877981741; Tue, 19 Nov 2013 08:19:41 -0800 (PST) Received: from storm-desktop.lan (bl14-141-156.dsl.telepac.pt. [85.247.141.156]) by mx.google.com with ESMTPSA id bs15sm7056476wib.10.2013.11.19.08.19.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 08:19:41 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: fix ordered extent check in btrfs_punch_hole Date: Tue, 19 Nov 2013 16:19:24 +0000 Message-Id: <1384877964-8286-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the ordered extent's last byte was 1 less than our region's start byte, we would unnecessarily wait for the completion of that ordered extent, because it doesn't intersect our target range. Signed-off-by: Filipe David Borba Manana --- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index c77da44..a679a36 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2129,7 +2129,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) * we need to try again. */ if ((!ordered || - (ordered->file_offset + ordered->len < lockstart || + (ordered->file_offset + ordered->len <= lockstart || ordered->file_offset > lockend)) && !test_range_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend, EXTENT_UPTODATE, 0,