From patchwork Tue Jan 17 22:31:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9522021 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 5CBFC6020B for ; Tue, 17 Jan 2017 22:38:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F45A28426 for ; Tue, 17 Jan 2017 22:38:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 443B228602; Tue, 17 Jan 2017 22:38:56 +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 E55EB28426 for ; Tue, 17 Jan 2017 22:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751177AbdAQWix (ORCPT ); Tue, 17 Jan 2017 17:38:53 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36386 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952AbdAQWiv (ORCPT ); Tue, 17 Jan 2017 17:38:51 -0500 Received: by mail-wm0-f66.google.com with SMTP id r126so41988930wmr.3 for ; Tue, 17 Jan 2017 14:38:50 -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=stXtYcFB9nOvRaSwpituO+Fe+KjEfKiBThH/eDCZkMc=; b=hNWBAft0lk8tbRXi6erD4hpDWGEeNUQHYb702Z/sAnQOxwb1HkeHJrBPtRCxDIlnSa GVpz6ZToFnWGqsH9wPI8LdCnhRuL42wJc/kdrll6r5I88oh/q0cN4Bjw0ra5UMBU9fUm yxr5BG6MezhlBYLGPAC7H+K283LVfyuurTPXkEcG52sTPQdUHoTidNTZI9ru+Ypc1ZjT JBXS6paHGvHMNYalAW6BrG1LfbC/zmdw09+uw2rSYzG9NgOkkAVy5v20F81DxnG6Fc47 QFKrhmGe2N3F3OtjRvyKByxjnhtDWLknWAsK5TscTRZ1slNGr2c2l1UC1mLiSOdsHLOt WAbw== 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=stXtYcFB9nOvRaSwpituO+Fe+KjEfKiBThH/eDCZkMc=; b=irWEaLkKNWzRGUHF+ZozUBxFhA/SiM3KhHKZs7AaLu/FFF6CEJDTxEJwMiGb+8+d/8 FBO5ObptE9SQWf0pPq923QiY98TFYRszvsFNVSEbUoCvfjO9XE5ISv7/VwMhKxYPDFkb KeJpTsum7dFa7pJI1rTR39crVlxw+6WO6tnCC7Arge1CQjuLUM9N6uly+ICxwfeR+qMg mQoBKqZ1/4x1Uko1cZH2rwK/MX9bELC7dpWt9t96YmG+H5O1yMdOI0gB2w+c/I1ZZ3Dn ZqVoRqIOTsL0ziJ0UngXC+BUVgawB+l7md2tDkIhnRRoG0hrm0sF2Ngx2KjAFSlc6K/d f9Lw== X-Gm-Message-State: AIkVDXKGfPQ5+VT0JhFsjtEkU+EOyYhvVOvP/jHkbpg0OxubZmThZUdD1GC7ShiQyiITdw== X-Received: by 10.28.17.20 with SMTP id 20mr289507wmr.99.1484692356108; Tue, 17 Jan 2017 14:32:36 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 14:32:35 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.cz Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCHv2 23/24] btrfs: Make count_inode_extrefs take btrfs_inode Date: Wed, 18 Jan 2017 00:31:49 +0200 Message-Id: <1484692310-3987-24-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 8c110d0e16c3..47e4f3610348 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1358,14 +1358,14 @@ static int insert_orphan_item(struct btrfs_trans_handle *trans, } static int count_inode_extrefs(struct btrfs_root *root, - struct inode *inode, struct btrfs_path *path) + struct btrfs_inode *inode, struct btrfs_path *path) { int ret = 0; int name_len; unsigned int nlink = 0; u32 item_size; u32 cur_offset = 0; - u64 inode_objectid = btrfs_ino(BTRFS_I(inode)); + u64 inode_objectid = btrfs_ino(inode); u64 offset = 0; unsigned long ptr; struct btrfs_inode_extref *extref; @@ -1487,7 +1487,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans, nlink = ret; - ret = count_inode_extrefs(root, inode, path); + ret = count_inode_extrefs(root, BTRFS_I(inode), path); if (ret < 0) goto out;