From patchwork Tue Jan 17 22:31:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9522055 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 1720E60447 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 0BAB228592 for ; Tue, 17 Jan 2017 22:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB7FC28615; 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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 6D41F28602 for ; Tue, 17 Jan 2017 22:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751392AbdAQWli (ORCPT ); Tue, 17 Jan 2017 17:41:38 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34599 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbdAQWlg (ORCPT ); Tue, 17 Jan 2017 17:41:36 -0500 Received: by mail-wm0-f65.google.com with SMTP id c85so9434217wmi.1 for ; Tue, 17 Jan 2017 14:41:35 -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=nDJw6gmBbR3dgGZRHI9CuZ2F3C6Z1AChbcvIayIFTsw=; b=L1yzwh7oCTYX6ZGIppH41XeZVXnUdjujwuv1zPnRZwBY5CpPvYESkKsCm36mTmGyop ICj2cmT/2uzXPD9o2PemdQpeUB+vWQBUA/Zf0zmPkpULjU0gB71CGfVpikvq5mMgyQ0j zmJ1bmt1gNgyChm3lI1g8IZmklF/Qm6/jyYo7Kom8kY87DoZKRBDZMPr0i6RFbnuy7Ob 9Jc7mETIcm87H1e9gb+ZwG25c17mUqfLw52vLUN3pHko7tiFEd70CeukgnW/OvsMQjtS kdLloO47GFT4E60KE/nfPsFY3x3w2MM+1QR882LJ1m7aB8Pf2mm+3ft6e4s+4zALgwul XYvw== 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=nDJw6gmBbR3dgGZRHI9CuZ2F3C6Z1AChbcvIayIFTsw=; b=XUXs7Vc8f35ir4rOgRdfGMMIl4b/0YHpHMIV3CcZiKiEkPKlCws0HMmjlMa9y35T02 jvfkre5yD/5ZpwRGyqVrAJ0Y75Ji4G0CIUez0oCXP/a4vwn4BLnLVnqiS2ni2oeF+b3G UfJVwz8ZQgOCGsCrTqluwedcCKL4jXS/mVVIo6V7j9XUznaIiqEEbdU6QMn5nZGwHDIs cJb3deXHKrtszc9QCiAAU9lSA2w3XLCzKCt0zFc9NLZv2NeMFXbRZ6iey/4KbpNd7iMi gq2HhnktS94fDxLIQh7wYE79qLLa+nkntI0kfPdbmq5PTUeAg1wgk4P4Ah+ZxIL5+Bn2 4n/Q== X-Gm-Message-State: AIkVDXIVn2NVi6FvLegq3RY8/bPewdx1s2IAPXdbDetXiTHNXdX7vNA1TkmCxNNTuO0Ncw== X-Received: by 10.223.172.136 with SMTP id o8mr18303wrc.76.1484692352862; Tue, 17 Jan 2017 14:32:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 14:32:32 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.cz Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCHv2 21/24] btrfs: Make log_inode_item take btrfs_inode Date: Wed, 18 Jan 2017 00:31:47 +0200 Message-Id: <1484692310-3987-22-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 d919cd4252ba..1348ab5e3229 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3592,19 +3592,18 @@ static void fill_inode_item(struct btrfs_trans_handle *trans, static int log_inode_item(struct btrfs_trans_handle *trans, struct btrfs_root *log, struct btrfs_path *path, - struct inode *inode) + struct btrfs_inode *inode) { struct btrfs_inode_item *inode_item; int ret; ret = btrfs_insert_empty_item(trans, log, path, - &BTRFS_I(inode)->location, - sizeof(*inode_item)); + &inode->location, sizeof(*inode_item)); if (ret && ret != -EEXIST) return ret; inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0], struct btrfs_inode_item); - fill_inode_item(trans, path->nodes[0], inode_item, inode, 0, 0); + fill_inode_item(trans, path->nodes[0], inode_item, &inode->vfs_inode, 0, 0); btrfs_release_path(path); return 0; } @@ -4930,7 +4929,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, btrfs_release_path(path); btrfs_release_path(dst_path); if (need_log_inode_item) { - err = log_inode_item(trans, log, dst_path, inode); + err = log_inode_item(trans, log, dst_path, BTRFS_I(inode)); if (err) goto out_unlock; }