From patchwork Tue Jan 10 18:35: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: 9508311 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 C15F860231 for ; Tue, 10 Jan 2017 18:36:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B814E28595 for ; Tue, 10 Jan 2017 18:36:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD45D2859B; Tue, 10 Jan 2017 18:36:25 +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 4D31428595 for ; Tue, 10 Jan 2017 18:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765917AbdAJSgJ (ORCPT ); Tue, 10 Jan 2017 13:36:09 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:34455 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939166AbdAJSgF (ORCPT ); Tue, 10 Jan 2017 13:36:05 -0500 Received: by mail-wj0-f195.google.com with SMTP id qs7so50818626wjc.1 for ; Tue, 10 Jan 2017 10:36:04 -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=7NNatfBozzBXvROvApN0b3jNwiYxxE5Fg9Yj1XJdQEk=; b=IXvL5uAOgQg18GfgLOjJTGpIZIgXYBAcRY8HFpX8QluzDwMYSTBJdYPE5mjn7jJdBa kO9QQz/g513SHVmfeTaVpsXBt7gCwNXUZTGzu7xVXZwYJNDconmj6Ag4MzY1QUYuShE5 xGDHfl/W72qdwfOqJnVWwx2RJT4kjWymKmXlBRzChISNhhKB2NxIZkMQAOTEUflXk5pX I1JEt6nxlFgR79WRkJXaagnC/L/3WzoH5F0ampdxic1/S7YOs0jHyt+usiNzCLW81U8k +OtLOCj2rrLWUV0p+LZPb1NgUg+1Dwwl0vwMdy60BxqNfM+ifiEyURnwlKGIwUHZsdis Sfxw== 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=7NNatfBozzBXvROvApN0b3jNwiYxxE5Fg9Yj1XJdQEk=; b=kurFqSKzbT/IOQwi8/55qEOHrLshjHMMZVX5h55t1W9DOUHfkgh5hwMnFVXfsNP6Nw KTZdvxeeqhTAkOLMC2b6LnJs2vtvddowa/aPyxLeb6O1t6h9+tXpdrJeiBszcgfUTZyG q/Ab006N+2LVn8qrs2dfJkOZe1hNaBCmFjc7XpvB/TXv3YdhfRBiFeLj9sm54Rflo+8D NhtIghFqrUdEbiSCxJkBv7Un3N2WW75+snbaITW7YJfpM4vyDJSWTI7p8K9Qv6XeAToD Y5ocpZXksjNMsT5IRSDHthc5hjWtOw2aQeff45OL3O6pDl/iCJ40GdYzYpzw7uXralSK F8xQ== X-Gm-Message-State: AIkVDXJZZp3AEnesskrl8sIguSk2oc+mpnLtvJrSnWaoG/ek2L7cqoZbkGj/Ki4v1j84SQ== X-Received: by 10.194.235.6 with SMTP id ui6mr2561473wjc.8.1484073363445; Tue, 10 Jan 2017 10:36:03 -0800 (PST) Received: from fisk.lan (ivokamhome.ddns.nbis.net. [87.120.136.31]) by smtp.gmail.com with ESMTPSA id jm6sm4572626wjb.27.2017.01.10.10.36.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 10:36:02 -0800 (PST) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 11/12] btrfs: Make btrfs_commit_inode_delayed_items take btrfs_inode Date: Tue, 10 Jan 2017 20:35:41 +0200 Message-Id: <1484073342-28854-12-git-send-email-n.borisov.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484073342-28854-1-git-send-email-n.borisov.lkml@gmail.com> References: <1484073342-28854-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/delayed-inode.c | 4 ++-- fs/btrfs/delayed-inode.h | 2 +- fs/btrfs/tree-log.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 17af7b186916..0afbea220fbb 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1194,9 +1194,9 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, } int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, - struct inode *inode) + struct btrfs_inode *inode) { - struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode)); + struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode); struct btrfs_path *path; struct btrfs_block_rsv *block_rsv; int ret; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index cd80fe8f150f..40bf1a943146 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -119,7 +119,7 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info); int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, - struct inode *inode); + struct btrfs_inode *inode); /* Used for evicting the inode. */ void btrfs_remove_delayed_node(struct btrfs_inode *inode); void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode); diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 69ab3d19ea1e..4e6f081512ab 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4655,7 +4655,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, */ if (S_ISDIR(inode->i_mode) || BTRFS_I(inode)->generation > fs_info->last_trans_committed) - ret = btrfs_commit_inode_delayed_items(trans, inode); + ret = btrfs_commit_inode_delayed_items(trans, BTRFS_I(inode)); else ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode));