From patchwork Wed Aug 14 02:00:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2844106 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 04807BF546 for ; Wed, 14 Aug 2013 02:00:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2846D20462 for ; Wed, 14 Aug 2013 02:00:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C67020464 for ; Wed, 14 Aug 2013 02:00:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759117Ab3HNCAm (ORCPT ); Tue, 13 Aug 2013 22:00:42 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:48809 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759061Ab3HNCAm (ORCPT ); Tue, 13 Aug 2013 22:00:42 -0400 Received: by mail-wg0-f49.google.com with SMTP id y10so7029028wgg.4 for ; Tue, 13 Aug 2013 19:00:40 -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:in-reply-to:references; bh=SuyIK7zmLRTxEA0gS8faU2ZoxEKo7hNND6UmXSPPQMQ=; b=EInhgCTnTqcX0mzkEcpyxTZUzUoBqGvXUr7Z4LF55T5WW8eeaa0RPdNUe9o0+1zDD1 a0TXNCJTdQ1zFAMdHU0Z+DImkmJzC2us4ifVLbwCE+ILI2O/ILSb/q+oT09GvDWvC9Td xCty2YW2S8vGdsGWspQsRC754nY0rcsrnc5XBJR8uA6T0PKrU43mPdn+8MrVgSeMXjzB gdFaZiByL9mh440o31IQT/WgqFAeCH41Git7Ds/q8+Pz4K0orHKkKw5aA80WcufDnrZw pDURtSQE4QlMinCJ9PT3iInyaSCgk326KYKse6DFmy1+R/xCllDzLnwf+hDjCxpWkx5G 55ug== X-Received: by 10.180.97.226 with SMTP id ed2mr539041wib.17.1376445640820; Tue, 13 Aug 2013 19:00:40 -0700 (PDT) Received: from storm-desktop.lan (bl13-157-29.dsl.telepac.pt. [85.246.157.29]) by mx.google.com with ESMTPSA id mb7sm175311wic.10.2013.08.13.19.00.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 19:00:39 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 2/2] Btrfs: don't miss inode ref items in BTRFS_IOC_INO_LOOKUP Date: Wed, 14 Aug 2013 03:00:21 +0100 Message-Id: <1376445621-18561-3-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376445621-18561-1-git-send-email-fdmanana@gmail.com> References: <1376445621-18561-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-9.6 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 inode ref key was not found and the current leaf slot was 0 (first item in the leaf) the code would always return -ENOENT. This was not correct because the desired inode ref item might be the last item in the previous leaf. Signed-off-by: Filipe David Borba Manana --- fs/btrfs/ioctl.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 3f2a8c1..e8f295c 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1998,19 +1998,21 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); if (ret < 0) goto out; + else if (ret > 0) { + ret = btrfs_previous_item(root, path, dirid, + BTRFS_INODE_REF_KEY); + if (ret < 0) + goto out; + else if (ret > 0) { + ret = -ENOENT; + goto out; + } + } l = path->nodes[0]; slot = path->slots[0]; - if (ret > 0 && slot > 0) - slot--; btrfs_item_key_to_cpu(l, &key, slot); - if (ret > 0 && (key.objectid != dirid || - key.type != BTRFS_INODE_REF_KEY)) { - ret = -ENOENT; - goto out; - } - iref = btrfs_item_ptr(l, slot, struct btrfs_inode_ref); len = btrfs_inode_ref_name_len(l, iref); ptr -= len + 1;