From patchwork Fri Mar 21 12:46:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3873841 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C07C09F382 for ; Fri, 21 Mar 2014 12:47:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBD11201FD for ; Fri, 21 Mar 2014 12:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 136A820212 for ; Fri, 21 Mar 2014 12:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760945AbaCUMrK (ORCPT ); Fri, 21 Mar 2014 08:47:10 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:47507 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760684AbaCUMrH (ORCPT ); Fri, 21 Mar 2014 08:47:07 -0400 Received: by mail-we0-f175.google.com with SMTP id q58so1569873wes.34 for ; Fri, 21 Mar 2014 05:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Fcq6LK4jGVWjkRu3MxMwbY5NUlomY+61hkhYsAYht/k=; b=QN9QaqdQrmS1/mwujkZYbmzTmAw1Qr+HGe6705KBkJ6+Zzl5OO4/2Urc8Fs9bT/5le VTP5kNtCBNfPSQvF6rGforFL1Y5nTp3DNCKbiFwCyz0AnrggW/P+tJeyjjg18spoWhc+ Wsl+oV/IObVX6+OKbwhW5ez7w/DimtYt7eR5Td9t0dptG+OZCq+s7vqSzXvgSPMCLRLt O14sCYopEs+XfGPakhp22MBnA4rMROGQ5yfACszvSzENC0OYA+drYsKHOomqLSDDpwhK 5g9NzPgCuHw6xHlRq0iEQrWgvJhioeoFEyA/uX2Ikp/NPa4Y64gCxyAQ47iwlNHakjxG q3Vw== X-Received: by 10.180.24.134 with SMTP id u6mr2443210wif.41.1395406026223; Fri, 21 Mar 2014 05:47:06 -0700 (PDT) Received: from debian-vm3.lan (bl13-154-103.dsl.telepac.pt. [85.246.154.103]) by mx.google.com with ESMTPSA id bj3sm13032732wjb.14.2014.03.21.05.47.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 05:47:05 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: send, avoid unnecessary inode item lookup in the btree Date: Fri, 21 Mar 2014 12:46:54 +0000 Message-Id: <1395406014-8535-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.10.4 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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Regardless of whether the caller is interested or not in knowing the inode's generation (dir_gen != NULL), get_first_ref always does a btree lookup to get the inode item. Avoid this useless lookup if dir_gen parameter is NULL (which is in some cases). Signed-off-by: Filipe David Borba Manana --- fs/btrfs/send.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index ab404ff..7233991 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1667,10 +1667,12 @@ static int get_first_ref(struct btrfs_root *root, u64 ino, goto out; btrfs_release_path(path); - ret = get_inode_info(root, parent_dir, NULL, dir_gen, NULL, NULL, - NULL, NULL); - if (ret < 0) - goto out; + if (dir_gen) { + ret = get_inode_info(root, parent_dir, NULL, dir_gen, NULL, + NULL, NULL, NULL); + if (ret < 0) + goto out; + } *dir = parent_dir; @@ -1686,13 +1688,12 @@ static int is_first_ref(struct btrfs_root *root, int ret; struct fs_path *tmp_name; u64 tmp_dir; - u64 tmp_dir_gen; tmp_name = fs_path_alloc(); if (!tmp_name) return -ENOMEM; - ret = get_first_ref(root, ino, &tmp_dir, &tmp_dir_gen, tmp_name); + ret = get_first_ref(root, ino, &tmp_dir, NULL, tmp_name); if (ret < 0) goto out;