From patchwork Thu Jan 12 14:00:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9513267 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 8950860710 for ; Thu, 12 Jan 2017 14:01:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B26A286B9 for ; Thu, 12 Jan 2017 14:01:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ED27286DA; Thu, 12 Jan 2017 14:01:29 +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 1482F286B9 for ; Thu, 12 Jan 2017 14:01:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751005AbdALOBV (ORCPT ); Thu, 12 Jan 2017 09:01:21 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33619 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbdALOBR (ORCPT ); Thu, 12 Jan 2017 09:01:17 -0500 Received: by mail-wm0-f68.google.com with SMTP id r144so3910767wme.0 for ; Thu, 12 Jan 2017 06:01:16 -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=SE/cLrHcDamhiMlnd0SygTRHPjrs4Y2PF2iB2x8Oymk=; b=gupVxHMffcjAeJ+gN9Wn3HzV4SQaPyCMqKopXE+p7nerOqvwqkfSJpSjsvAVwqsh/N wPMaOgGqfrHD3U3y51dO77tfjplkFLQAy3/WBOo3+G5TrUTrfYlbLEUvs9JT5ufiesVS NpJsbSvFnz9TlYR8Kz9ivzzCh5ptmk6x0WwQilCQSL5YXCUC5vJlH3JM+HAQ8eYZog5E MxCKV3WMuQROCwctlHoGYCLCjROTNwRn6RahwJEVomRAO9pc1/Dphi5ZVtHpI7rxt7Dv 64MrUMZlPTkIejdy4j0VltmA/0uOzPgoM1H2/mFN8Kyjn6rUjdu281eIfZzOcXsvuE4y aIXQ== 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=SE/cLrHcDamhiMlnd0SygTRHPjrs4Y2PF2iB2x8Oymk=; b=Tvg7UoUgmHkB8XU2Bti+FlfED5JHp8ngktVG04YSmK9n5t2pFGiJq0in8OS8J5Z7wx v96nDYooLkDmNSIrdHFWtPM/Yz2TG+ZdXAzRwDH37vGSgJvJbtxOAnCjXEz0mniusCAy HoRnjHwFPke3a/WULxLHIju5HK6hem8rDCCh01+IEDMniidDr9X8OUVyvvLqsIzHYKHI 7FYxZ1k+eoBh4dQ5jCn0TeypWl+DglvCP1x9Toew26bHU+t0xWaZrZe5G90ZWLla2Fs5 ZRS9TFaTi4ghFor/erOx7ObEnr2GScUAnOX5Lqi2UgDkuDOzHNDae4UvtgjY9R9A+Qta rSFg== X-Gm-Message-State: AIkVDXL36LMuheB9JyvC3V2F6mVC9edpmAm5rVCQXh34mj/Q28/PfqdnAqk7LRlSQgL/aQ== X-Received: by 10.28.168.73 with SMTP id r70mr8119195wme.57.1484229676048; Thu, 12 Jan 2017 06:01:16 -0800 (PST) Received: from fisk.lan (ivokamhome.ddns.nbis.net. [87.120.136.31]) by smtp.gmail.com with ESMTPSA id y145sm725670wmc.17.2017.01.12.06.01.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jan 2017 06:01:15 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCH 19/24] btrfs: Make drop_one_dir_item take btrfs_inode Date: Thu, 12 Jan 2017 16:00:45 +0200 Message-Id: <1484229650-24554-20-git-send-email-n.borisov.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484229650-24554-1-git-send-email-n.borisov.lkml@gmail.com> References: <1484229650-24554-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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 73a7e7b5aadc..834d90398cb4 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -842,7 +842,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, - struct inode *dir, + struct btrfs_inode *dir, struct btrfs_dir_item *di) { struct btrfs_fs_info *fs_info = root->fs_info; @@ -874,7 +874,7 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, if (ret) goto out; - ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), BTRFS_I(inode), name, name_len); + ret = btrfs_unlink_inode(trans, root, dir, BTRFS_I(inode), name, name_len); if (ret) goto out; else @@ -1150,7 +1150,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), ref_index, name, namelen, 0); if (di && !IS_ERR(di)) { - ret = drop_one_dir_item(trans, root, path, dir, di); + ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di); if (ret) return ret; } @@ -1160,7 +1160,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), name, namelen, 0); if (di && !IS_ERR(di)) { - ret = drop_one_dir_item(trans, root, path, dir, di); + ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di); if (ret) return ret; } @@ -1768,7 +1768,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, if (!exists) goto out; - ret = drop_one_dir_item(trans, root, path, dir, dst_di); + ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), dst_di); if (ret) goto out;