From patchwork Sun Jul 25 14:42:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 114131 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6PEbeg2021173 for ; Sun, 25 Jul 2010 14:37:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750955Ab0GYOh2 (ORCPT ); Sun, 25 Jul 2010 10:37:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5614 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819Ab0GYOh2 (ORCPT ); Sun, 25 Jul 2010 10:37:28 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6PEbOES004374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 25 Jul 2010 10:37:24 -0400 Received: from dhcp231-156.rdu.redhat.com (dhcp231-156.rdu.redhat.com [10.11.231.156]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6PEbNQq007530; Sun, 25 Jul 2010 10:37:23 -0400 Date: Sun, 25 Jul 2010 10:42:24 -0400 From: Josef Bacik To: Daniel J Blueman Cc: Chris Mason , Linux BTRFS , Josef Bacik Subject: Re: [2.6.35-rc6 patch] direct I/O submission fixes Message-ID: <20100725144224.GA21910@dhcp231-156.rdu.redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 25 Jul 2010 14:37:40 +0000 (UTC) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3232945..7259ef9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5815,7 +5815,7 @@ free_ordered: if (write) { struct btrfs_ordered_extent *ordered; ordered = btrfs_lookup_ordered_extent(inode, - dip->logical_offset); + file_offset); if (!test_bit(BTRFS_ORDERED_PREALLOC, &ordered->flags) && !test_bit(BTRFS_ORDERED_NOCOW, &ordered->flags)) btrfs_free_reserved_extent(root, ordered->start,