From patchwork Tue Jan 10 18:35:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9508319 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 C23826075C for ; Tue, 10 Jan 2017 18:36:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9CD72858A for ; Tue, 10 Jan 2017 18:36:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEC9228595; Tue, 10 Jan 2017 18:36:26 +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 0BC7028599 for ; Tue, 10 Jan 2017 18:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939232AbdAJSgH (ORCPT ); Tue, 10 Jan 2017 13:36:07 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:35031 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939115AbdAJSgD (ORCPT ); Tue, 10 Jan 2017 13:36:03 -0500 Received: by mail-wj0-f195.google.com with SMTP id ey1so9325973wjd.2 for ; Tue, 10 Jan 2017 10:36:03 -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=UyrH83vy2RrkiUAT7a2SoRFUvLsRffahFKM8gUk51L0=; b=bchF+zauvew3yK87phiVNMJmFOMxhsYHKkkCUvao/CA/tM/zRXfrlgki9NXpQA7ZPa u3EEruq6/i+t5nIY4mCjjjx/ncKzzKNEOs8dCo7BGejmFCQRBUIRBdY6VtNy1z0JQ3TO Ebc0l27rmDmg//Mk3pz+o9uJ2TCim5sSRWNsIP2bZG95pnh7dvBrc4wVh07T/YIsTdEg o29FhE1iYPdUP+GvZYjm7a6tqjyXhKK8KsQwe1N1ipj+cvmRRQirv0eXNF8tliOXxYq1 kXWd6O4UlmiqX/bA8OC3nQP7on1xIMnKr/XMm8jOWdYViCil7zITRKr6u18oeu74D8YK +CAA== 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=UyrH83vy2RrkiUAT7a2SoRFUvLsRffahFKM8gUk51L0=; b=KTu+oLAIMEDNQ0pmcXy/qcWBDERPo1LbYwYDoshJOIeqQNpaUYfDqqPmq5i19GxwMJ bdvbYRtnof+Fft+CXyrZNC7pHhQjZ3afpBPoQxCBuTBRFMcgBxijrNZZ6Ur653Yt+Pgs 4CeiBmudOR0RSwwmrgVO1QpHMHi9PweUVFus9YaliilC55SpJoo3nnW/shpO0i8kwEpe iHxBdWe4d8BBSUmWz7YiyuNzTiY3BTaHd1CtS2LKTHcVy+1Jl2Joiblga3L9foewjqUH Bj3hu/KxX40Wmadia5n5H78wAeOxcS2RapXW4Mi2mWPL2by7iPb+M2QsjkwRIl2StyDw pPNw== X-Gm-Message-State: AIkVDXIeniZXUV4wbZYCf37yE0eoPNsmefAGMR296Nzu6ucy1CkCllMLdlSuZnQXAtww1w== X-Received: by 10.194.204.197 with SMTP id la5mr3010785wjc.43.1484073362226; Tue, 10 Jan 2017 10:36:02 -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.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 10:36:01 -0800 (PST) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 10/12] btrfs: Make btrfs_commit_inode_delayed_inode take btrfs_inode Date: Tue, 10 Jan 2017 20:35:40 +0200 Message-Id: <1484073342-28854-11-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 | 6 +++--- fs/btrfs/delayed-inode.h | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/tree-log.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 5d4dd3e18af3..17af7b186916 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1231,11 +1231,11 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, return ret; } -int btrfs_commit_inode_delayed_inode(struct inode *inode) +int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode) { - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb); struct btrfs_trans_handle *trans; - 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 81572693d0e0..cd80fe8f150f 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -123,7 +123,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, /* Used for evicting the inode. */ void btrfs_remove_delayed_node(struct btrfs_inode *inode); void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode); -int btrfs_commit_inode_delayed_inode(struct inode *inode); +int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode); int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 874a8689938f..92051c441435 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5274,7 +5274,7 @@ void btrfs_evict_inode(struct inode *inode) goto no_delete; } - ret = btrfs_commit_inode_delayed_inode(inode); + ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode)); if (ret) { btrfs_orphan_del(NULL, inode); goto no_delete; diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 0ad6da8b194b..69ab3d19ea1e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4657,7 +4657,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, BTRFS_I(inode)->generation > fs_info->last_trans_committed) ret = btrfs_commit_inode_delayed_items(trans, inode); else - ret = btrfs_commit_inode_delayed_inode(inode); + ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode)); if (ret) { btrfs_free_path(path);