From patchwork Tue Jan 10 18:35:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9508317 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 6E84160231 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 651DF2858A for ; Tue, 10 Jan 2017 18:36:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59F9928595; 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 0D5042859B for ; Tue, 10 Jan 2017 18:36:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939090AbdAJSgS (ORCPT ); Tue, 10 Jan 2017 13:36:18 -0500 Received: from mail-wj0-f196.google.com ([209.85.210.196]:36044 "EHLO mail-wj0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdAJSgH (ORCPT ); Tue, 10 Jan 2017 13:36:07 -0500 Received: by mail-wj0-f196.google.com with SMTP id dh1so8083600wjb.3 for ; Tue, 10 Jan 2017 10:36:06 -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=ggUTO2KFQLysLykJrM8ck7PYJzkLgJlxn8V1a2R1Be4=; b=uLiGHFw+MPGmSwKS5LQ0Cax425jdS9+mhgJZDgkwI0xvT8pFn3GT/ETWvgQRw7soCY WaUwA1j7ekTNE7hrAj1s9UtTd0MCPrRd3s93D4fQClSFWWR/xzNt9xwqyW/9L6CUzZgn Pp74R38f8nzPmH+421jmcVq4WYKYUX7vLzNyQLyKD9yWnL8H3dMWx1LPGAjXDyWOQAhw ptDb0iEtvC7AriQ2MgGZx2jaVb+Kz3OcnwloNPb2ajmtBZ5YnJPlwRgXKqd7lOJDjfaR Orjnr751lCxPOok4SYeEgJMUdTQ5r2QHGw16oxScKbJztAY9iVOXGEL0SGclNYHHBD8o /ktw== 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=ggUTO2KFQLysLykJrM8ck7PYJzkLgJlxn8V1a2R1Be4=; b=YfGVWSczJ952r263IYMHhbCLuS5vdsNwCGhhbu5m2UqAwDN4HF1twEeNfxaaN6mgCb KJLJZwat3Paqnki1Uk941HyphLck8zWBZXqwGdLRWaYstVz2fSBB20YDjflEy0Hl2jnz Nu2QEDaNACKZ4V1P8rrWxg2RF7EJ1HxJYKarzQR860SKpxBjFAMXUwIiTjLwpmP8kSQ1 PSK2FhLtPKrFyLpIRuxwswCQV3YeQXVyBGsOY8Qm8Vvt+V3IfU10+Wj+ehbgrR5Nxu3E 6MvcYd+9bMNdUR7Ht0D6c7BhdUtTPlE3m6eaQQVLyrz7mtjQ8+XivSdC1TVGoRVfcH6E Phiw== X-Gm-Message-State: AIkVDXJARQGash96kwRsR/7El3jkZ4IxZN8hxBoEHTGZ56q8ScAq4TaceVh+LsWKvhaQow== X-Received: by 10.194.19.101 with SMTP id d5mr2524829wje.18.1484073360575; Tue, 10 Jan 2017 10:36:00 -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.35.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 10:36:00 -0800 (PST) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 08/12] btrfs: Make btrfs_kill_delayed_inode_items take btrfs_inode Date: Tue, 10 Jan 2017 20:35:38 +0200 Message-Id: <1484073342-28854-9-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/inode.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 3adf47427451..73a588d0f957 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1931,11 +1931,11 @@ static void __btrfs_kill_delayed_node(struct btrfs_delayed_node *delayed_node) mutex_unlock(&delayed_node->mutex); } -void btrfs_kill_delayed_inode_items(struct inode *inode) +void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode) { struct btrfs_delayed_node *delayed_node; - delayed_node = btrfs_get_delayed_node(BTRFS_I(inode)); + delayed_node = btrfs_get_delayed_node(inode); if (!delayed_node) return; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index dbb02f4d5dda..fbada25cd17e 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -122,7 +122,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, struct inode *inode); /* Used for evicting the inode. */ void btrfs_remove_delayed_node(struct inode *inode); -void btrfs_kill_delayed_inode_items(struct inode *inode); +void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode); int btrfs_commit_inode_delayed_inode(struct inode *inode); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8e259c3ae4dd..1a72ee1e4994 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4440,7 +4440,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, * items. */ if (min_type == 0 && root == BTRFS_I(inode)->root) - btrfs_kill_delayed_inode_items(inode); + btrfs_kill_delayed_inode_items(BTRFS_I(inode)); key.objectid = ino; key.offset = (u64)-1;