From patchwork Tue Nov 26 15:01:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3239261 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 34B1AC045B for ; Tue, 26 Nov 2013 15:02:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59CC0203E6 for ; Tue, 26 Nov 2013 15:02:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3780203AE for ; Tue, 26 Nov 2013 15:01:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756983Ab3KZPBo (ORCPT ); Tue, 26 Nov 2013 10:01:44 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:33017 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756518Ab3KZPBn (ORCPT ); Tue, 26 Nov 2013 10:01:43 -0500 Received: by mail-wi0-f173.google.com with SMTP id hm4so5300961wib.12 for ; Tue, 26 Nov 2013 07:01:42 -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=3eTey57UY+ZQhMBZtTD7pKPOqijZ7u7z1yBiHyaeWnU=; b=u09k/0KAv0ohYXyWVpqkswkJ9InPjWTif0eAChFVzukrWa29Z5qClgUnEYrG4TYx9z V0LL5uhrPFlSno9bp7lC5VnwGw1cJ/oJvTOQxDnUKR/v2/pea258E1XtJpaQXn3V87oI VvItHpQGS6Jiaen21vBy7Q4DDlAgPnFP9Gu/EgpcjObCo2EsPs1byTVPlxc+yo+iS2d3 Ih8W0/iH5/upcxWZo1H0Vjp/22qaM/gZQlA2N1wM2P2VDpfX5s80xlfIQJyIW8SZGFgP HNX+qtH684/7cj05vdDN+ENhuNtVWd6UWF3En9Zn+7RdF24y5ZkHSjAF7gdA7HpU0+X+ vuAQ== X-Received: by 10.180.9.74 with SMTP id x10mr17713887wia.56.1385478102397; Tue, 26 Nov 2013 07:01:42 -0800 (PST) Received: from storm-desktop.lan (bl8-165-165.dsl.telepac.pt. [85.241.165.165]) by mx.google.com with ESMTPSA id qc10sm61496645wic.9.2013.11.26.07.01.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 07:01:41 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: add missing extent state caching calls Date: Tue, 26 Nov 2013 15:01:34 +0000 Message-Id: <1385478094-11984-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=-6.8 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 When we didn't find a matching extent state, we inserted a new one but didn't cache it in the **cached_state parameter, which makes a subsequent call do a tree lookup to get it. Signed-off-by: Filipe David Borba Manana --- fs/btrfs/extent_io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index cb9ce69..b8e7e41 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -817,6 +817,7 @@ again: if (err) extent_io_tree_panic(tree, err); + cache_state(prealloc, cached_state); prealloc = NULL; goto out; } @@ -1040,9 +1041,10 @@ again: goto out; } err = insert_state(tree, prealloc, start, end, &bits); - prealloc = NULL; if (err) extent_io_tree_panic(tree, err); + cache_state(prealloc, cached_state); + prealloc = NULL; goto out; } state = rb_entry(node, struct extent_state, rb_node);