From patchwork Mon Sep 17 07:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10602121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEE3C13AD for ; Mon, 17 Sep 2018 07:22:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B89B2295FF for ; Mon, 17 Sep 2018 07:22:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD2B729609; Mon, 17 Sep 2018 07:22:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57395295FF for ; Mon, 17 Sep 2018 07:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728310AbeIQMsQ (ORCPT ); Mon, 17 Sep 2018 08:48:16 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:17617 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727099AbeIQMsP (ORCPT ); Mon, 17 Sep 2018 08:48:15 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="44983904" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 Sep 2018 15:21:59 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 3EF5A4B6EC83 for ; Mon, 17 Sep 2018 15:21:59 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.31) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 17 Sep 2018 15:22:01 +0800 From: Su Yue To: CC: Subject: [PATCH v3 1/7] btrfs-progs: adjust arguments of btrfs_lookup_inode_extref() Date: Mon, 17 Sep 2018 15:28:46 +0800 Message-ID: <20180917072852.25831-2-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917072852.25831-1-suy.fnst@cn.fujitsu.com> References: <20180917072852.25831-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 3EF5A4B6EC83.ADE61 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: suy.fnst@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The argument index is not used in btrfs_lookup_inode_extref(), so remove it. And adjust positions its arguments to make it consistent with kernel part. No functional change. Fixes: 260675657767 ("btrfs-progs: Import btrfs_insert/del/lookup_extref() functions.") Signed-off-by: Su Yue Reviewed-by: Qu Wenruo --- ctree.h | 9 +++++---- inode-item.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ctree.h b/ctree.h index 2a2437070ef9..541055a335c2 100644 --- a/ctree.h +++ b/ctree.h @@ -2710,10 +2710,11 @@ int btrfs_insert_inode(struct btrfs_trans_handle *trans, struct btrfs_root int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, struct btrfs_key *location, int mod); -struct btrfs_inode_extref *btrfs_lookup_inode_extref(struct btrfs_trans_handle - *trans, struct btrfs_path *path, struct btrfs_root *root, - u64 ino, u64 parent_ino, u64 index, const char *name, - int namelen, int ins_len); +struct btrfs_inode_extref * +btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans, + struct btrfs_root *root, struct btrfs_path *path, + const char *name, int namelen, u64 ino, + u64 parent_ino, int ins_len); int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, struct btrfs_root *root, const char *name, int name_len, diff --git a/inode-item.c b/inode-item.c index 1cc106670cd4..ca0052bc2f87 100644 --- a/inode-item.c +++ b/inode-item.c @@ -227,10 +227,11 @@ static int btrfs_find_name_in_ext_backref(struct btrfs_path *path, return 0; } -struct btrfs_inode_extref *btrfs_lookup_inode_extref(struct btrfs_trans_handle - *trans, struct btrfs_path *path, struct btrfs_root *root, - u64 ino, u64 parent_ino, u64 index, const char *name, - int namelen, int ins_len) +struct btrfs_inode_extref * +btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans, + struct btrfs_root *root, struct btrfs_path *path, + const char *name, int namelen, u64 ino, + u64 parent_ino, int ins_len) { struct btrfs_key key; struct btrfs_inode_extref *extref;