From patchwork Tue Jan 17 22:31:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9522061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83FF86020B for ; Tue, 17 Jan 2017 22:41:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7848F28592 for ; Tue, 17 Jan 2017 22:41:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D29F285F0; Tue, 17 Jan 2017 22:41:51 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 1405B28592 for ; Tue, 17 Jan 2017 22:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751414AbdAQWlt (ORCPT ); Tue, 17 Jan 2017 17:41:49 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33799 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbdAQWls (ORCPT ); Tue, 17 Jan 2017 17:41:48 -0500 Received: by mail-wm0-f67.google.com with SMTP id c85so9436135wmi.1 for ; Tue, 17 Jan 2017 14:41:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u/y2T67eZIuvphsXxwZ2Dmeuby1giIy63JXu8aetNs4=; b=CN2ViPmFbgpkaSqio11IlmCXP4EJHDbEMZ65lar4mhPe1a5fbOyytEE9/7yaWSP9TX ZaXR/bVx0GX4wyuRqZ4I05y2xOGXZ6GljSMbkGkwbcXnLTczuLxGugjgl2Vexw+P44KG EkudIoDBcSXScAEx5oyUgZEL4ZqjL+qKWo2TCuFRi+VBkoQtWNPsO8Pq0PbQq6XgXkpR poX4N8fzo+/YuGSDCNuZAaZkmbgmuRvtFvi/E0WoUOQJEtx1e8spxuhxkGBGb5t68J6E aHhCogJXq4hsfrbTvizPc9oCyx1p3iPpYZOXSM4lV5Nn2Tj/CRMgnuDHZ5Dc3yb7dP4Y 2JZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u/y2T67eZIuvphsXxwZ2Dmeuby1giIy63JXu8aetNs4=; b=ljIowjs8r27HlE3MzANz7QTw7EyNuWF6oCaTLqwXP/h/bXlN8RxdogFSvVbp7gxVwF rC0BTImcfnDslwS2hnbhRh516pz3Qe44K9MA65OtG4ZM/GS0uUL8wosxFSyDWJpwibSC SpVt4iYWe3M6M++2VY1BWKZINAZw/HCpWZ3LAu6WfReg5WPFaj87y4Y0GhGKSoM3Sg1r weiNhC7LdW0XDgSDMxm23MPZDgoFeVB8nkZBHazFkDohQeYRy6WZj86Oq5H/XnfoMULF GeC+aEBCKWFfw6qIkZ9NAF6t97u4kxNkcxwqth8xVmFD8HeYkwmEtkav0BeNLmr+CB1e y/Cw== X-Gm-Message-State: AIkVDXLjgSNu3J61KjtyjVPRW4X4eGibeL6i5qHU+LDBktoZouHBQNARUnPuZmBNfLIuww== X-Received: by 10.28.43.129 with SMTP id r123mr4021449wmr.120.1484692357417; Tue, 17 Jan 2017 14:32:37 -0800 (PST) Received: from fisk.lan (ivokamhome.ddns.nbis.net. [87.120.136.31]) by smtp.gmail.com with ESMTPSA id w197sm39980489wmd.11.2017.01.17.14.32.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 14:32:36 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.cz Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCHv2 24/24] btrfs: Make count_inode_refs take btrfs_inode Date: Wed, 18 Jan 2017 00:31:50 +0200 Message-Id: <1484692310-3987-25-git-send-email-n.borisov.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484692310-3987-1-git-send-email-n.borisov.lkml@gmail.com> References: <20170117161550.GW12081@twin.jikos.cz> <1484692310-3987-1-git-send-email-n.borisov.lkml@gmail.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 Signed-off-by: Nikolay Borisov --- fs/btrfs/tree-log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 47e4f3610348..a16da4a3ab63 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1402,7 +1402,7 @@ static int count_inode_extrefs(struct btrfs_root *root, } static int count_inode_refs(struct btrfs_root *root, - struct inode *inode, struct btrfs_path *path) + struct btrfs_inode *inode, struct btrfs_path *path) { int ret; struct btrfs_key key; @@ -1410,7 +1410,7 @@ static int count_inode_refs(struct btrfs_root *root, unsigned long ptr; unsigned long ptr_end; int name_len; - u64 ino = btrfs_ino(BTRFS_I(inode)); + u64 ino = btrfs_ino(inode); key.objectid = ino; key.type = BTRFS_INODE_REF_KEY; @@ -1481,7 +1481,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans, if (!path) return -ENOMEM; - ret = count_inode_refs(root, inode, path); + ret = count_inode_refs(root, BTRFS_I(inode), path); if (ret < 0) goto out;