From patchwork Tue Jan 17 22:31:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9522053 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 015166043D for ; Tue, 17 Jan 2017 22:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7E4B28592 for ; Tue, 17 Jan 2017 22:41:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD090285A2; Tue, 17 Jan 2017 22:41:40 +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 19E19285F0 for ; Tue, 17 Jan 2017 22:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387AbdAQWld (ORCPT ); Tue, 17 Jan 2017 17:41:33 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35250 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbdAQWlc (ORCPT ); Tue, 17 Jan 2017 17:41:32 -0500 Received: by mail-wm0-f68.google.com with SMTP id d140so25597139wmd.2 for ; Tue, 17 Jan 2017 14:41:31 -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=k7YEKlnSWgCfidbiS0DZ+93V1W9FrAKYQSLd8Y/1vCo=; b=TVkgVDeQrel56g+hKQOdSmEc7hDX4IaLu8bN5qZukIDtebduKpdM1nzCm/9klyZEHg eQTp0JnGTNMURMSGfIMF5JXCSY8qyNnUYRRNawcdnvY5crNTj08iG0v3JzLmdNvSAyF6 H43UvpYp1e0Wlm8JaT7tAJxqWgiW79ZtuaZ4btfyCGyt/fgPqweXS3SoZhIZiFZNpavf JAT0YU8txt9pnLlUZzv3dzX2lejd5r8o+cs6mP+bihd1a4YQSujuZrwYEvvsW++IV2MJ u85jvKISUciFnlB+pNXPMhUjWDAjLbAOw29RUrsM3VxFT1JaP6/KhRIouSN8Vky8bcWs Pyng== 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=k7YEKlnSWgCfidbiS0DZ+93V1W9FrAKYQSLd8Y/1vCo=; b=bFh1F0S1la4LfwiWJ27gSEAExZ2nfG31sxROEJnL2GWSGJsfbNNjDfSBdjlkVLXlaj aR1LgodFGAtJ7OE1QP/4MSibqgiSUfxClEmWAY6Lw7YQdMPNmIUMKw2JK56SDkWksiaH 4yus0L4c7sNW9ZESjkiN0QWbgEQhDVKugbqWkdYUQQjctJEt92wk650/DFtiqELWSNqk NVsKAeHxJnM0ook61wbjlEPnWNcareFdq8UHMGYJXkPp9VucPfo40BBRX4velNfoxAa/ oDW6G1oU4jjDUrR+j6D4jdnIZCetG0K03LElIzmUEc4PulC0nit2EVSLJPKOV+CDosmK wO3A== X-Gm-Message-State: AIkVDXJq1PPAMY2i9BY52+7YIOBoMnpTSFUYqdb7IqpvpbQB3fKmH1oDEhBMgXFLq5LICg== X-Received: by 10.28.8.130 with SMTP id 124mr17180156wmi.65.1484692344856; Tue, 17 Jan 2017 14:32:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 14:32:24 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.cz Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCHv2 16/24] btrfs: Make log_directory_changes take btrfs_inode Date: Wed, 18 Jan 2017 00:31:42 +0200 Message-Id: <1484692310-3987-17-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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 8d7197a0eceb..38cda7869bf9 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3450,7 +3450,7 @@ static noinline int log_dir_items(struct btrfs_trans_handle *trans, * key logged by this transaction. */ static noinline int log_directory_changes(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct inode *inode, + struct btrfs_root *root, struct btrfs_inode *inode, struct btrfs_path *path, struct btrfs_path *dst_path, struct btrfs_log_ctx *ctx) @@ -3464,9 +3464,8 @@ static noinline int log_directory_changes(struct btrfs_trans_handle *trans, min_key = 0; max_key = 0; while (1) { - ret = log_dir_items(trans, root, BTRFS_I(inode), path, - dst_path, key_type, ctx, min_key, - &max_key); + ret = log_dir_items(trans, root, inode, path, dst_path, key_type, + ctx, min_key, &max_key); if (ret) return ret; if (max_key == (u64)-1) @@ -4977,7 +4976,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, } if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) { - ret = log_directory_changes(trans, root, inode, path, dst_path, + ret = log_directory_changes(trans, root, BTRFS_I(inode), path, dst_path, ctx); if (ret) { err = ret;