From patchwork Thu Jan 12 14:00:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9513259 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 A61AF60710 for ; Thu, 12 Jan 2017 14:01:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98645286B9 for ; Thu, 12 Jan 2017 14:01:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D498286D9; Thu, 12 Jan 2017 14:01:21 +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 49108286B9 for ; Thu, 12 Jan 2017 14:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751059AbdALOBR (ORCPT ); Thu, 12 Jan 2017 09:01:17 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35775 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbdALOBO (ORCPT ); Thu, 12 Jan 2017 09:01:14 -0500 Received: by mail-wm0-f66.google.com with SMTP id l2so3919985wml.2 for ; Thu, 12 Jan 2017 06:01:14 -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=zGtjYSDo6O9lJecfdNphGANI5cCCXN5SpEQtqwsTOlE=; b=S/ukYN22PiJMyAQvAPrRAWp00EN3MVF2xxttX7pcAL/ftuwqPcJNaWXFDYNJvtyyNq RvxzNdDPq2bgKM4ABpoCgKu4cNjisUYB92oFzmxZ0v3rwpZG3c2aVoZLi/Zb7clpWWss B5OE0TY9OgPu+aiyOmZmrl8xKNQGLJD8Cj5pCTDbo/yRFh40nNl/M7jtC792XiHsTrmx jPnb+RWE9lW+3hdbTpwzjw72rUbtdOXsqvVhPI9BxgW/A4RFqgYAPc3swoEbltW991RJ B5EbrwbPeST0JY+F11kOg731U0535p6P+JsGr11nVs/fcJjMR7yDg26FUd79obwEZmOP pXpA== 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=zGtjYSDo6O9lJecfdNphGANI5cCCXN5SpEQtqwsTOlE=; b=OWQ27QtVKs5Q/WwQDv6HC1/mFOjuji05gGHnEuZbQXt1cY0ubuvlLdiy69mnc52od/ /d9/0lgBoCw8uWJIAVyWDpcshrNbg9xWkh/wBdqWvQJgrgBtJODxdkcQQztyWWcivJ6R gbvkyUtLi1NjpMWEIy6RUXziK6H5755vNIc0euntuPiaZyQE9dHBCaocZ0jA+Wx7Xhyr hlF1k7dfYGc8FFVknGpDoRsPiSX6Qy8YHds3wYbk73QGmVpj1+/1KdPWfsUCE0Wa/5RX 2XSyDYdAHxgQdX5Vlv/bc8JUQyD/7xXP8t40bBR7rvrinTvF83vexc8tW1DrLOUCSfDd J0yw== X-Gm-Message-State: AIkVDXJR0/YGntUnZL7e7GkUC6Rb8X+OORyQV/R1OnL3ZN6ZI88Hu/w/LWhY/+0i0O4vzQ== X-Received: by 10.28.184.88 with SMTP id i85mr7863391wmf.49.1484229672156; Thu, 12 Jan 2017 06:01:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jan 2017 06:01:11 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCH 15/24] btrfs: Make log_dir_items take btrfs_inode Date: Thu, 12 Jan 2017 16:00:41 +0200 Message-Id: <1484229650-24554-16-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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 5abe54963049..84c1ab4c8a7f 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3259,7 +3259,7 @@ static noinline int insert_dir_log_key(struct btrfs_trans_handle *trans, * to replay anything deleted before the fsync */ static noinline int log_dir_items(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, int key_type, struct btrfs_log_ctx *ctx, @@ -3274,7 +3274,7 @@ static noinline int log_dir_items(struct btrfs_trans_handle *trans, int nritems; u64 first_offset = min_offset; u64 last_offset = (u64)-1; - u64 ino = btrfs_ino(BTRFS_I(inode)); + u64 ino = btrfs_ino(inode); log = root->log_root; @@ -3463,7 +3463,7 @@ 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, inode, path, + ret = log_dir_items(trans, root, BTRFS_I(inode), path, dst_path, key_type, ctx, min_key, &max_key); if (ret)