From patchwork Tue Jan 10 18:35:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9508305 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 415AE60762 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 38B3F28595 for ; Tue, 10 Jan 2017 18:36:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D6C62859F; 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 BDED52859B for ; Tue, 10 Jan 2017 18:36:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939067AbdAJSgD (ORCPT ); Tue, 10 Jan 2017 13:36:03 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:34438 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765917AbdAJSgA (ORCPT ); Tue, 10 Jan 2017 13:36:00 -0500 Received: by mail-wj0-f195.google.com with SMTP id qs7so50818427wjc.1 for ; Tue, 10 Jan 2017 10:35:59 -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=oQ+Hy3XbL+mV2jayHHPnAYsvmd9OgX6NHGPW+SS4v2M=; b=s9FsaqxEXTlHu0XL7p96OqzKDHZXPmT7ytJdylPEbA2o6I3HpDWOziEZZ/8EOezc/V dJOoJo1GZ4mDwJybzJw9seUXEMX6kJOnE0N/610hZ8VhdMVGZGwOXt3fi+zGPgCV5nUc tEdO9K24rSnorbc2oGCW2ZYtNLi99FBo9SZykZVVb1TkuLqX0O6Ep9BEF1zBWeUF1cZd 8TGNZABVaxJLGyV08iVbVvuGDaKdJL6nAIpkeWpSpof6GiUsKszIT0Nhbnj/vB3MYvYr H+psspiHX0Zd7gxvX7EMXaGRGtLGGd/ZzJhTObF716kccslIV+C3jNFZLgMmsyhLiKM9 A8jw== 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=oQ+Hy3XbL+mV2jayHHPnAYsvmd9OgX6NHGPW+SS4v2M=; b=S98cAyVcN2h/FN0IqIrB8B0lqhhWndj9tjOTcT48xAZIVeFF977cUGrSYfiY2WhmTH XjL5rTFT+T0tDR3vnheWO/I5LSLhK5jBJKCg8N6Dscu5ZXEI8HstVS47bRnbQjTw3B8r eI/DOHzdzyT2nWw9HEVLTvpUAlplZ7BB77lbj0ZJBZrdYGS7NZ2v0/L/tn9WjNFiyZq7 Ttdr5yfMzEgV6aTvlvHndl2aBJXcm5t740QXi7SiCAOC5ioqZlb2UOyjzHb4Cb+SYyVC x3LMdgkyQkywEpYkZflBI7VrxmcOjnyXRGk1fxyZDOFGPtarh72XTVexRz1kUw1lPUsZ Tehg== X-Gm-Message-State: AIkVDXLywI3pZTkTV+hpjQNo5TxQ/zZlr+7r7hgj65EZ6y9DfXzLNvtbb0QTntTWP+DAMA== X-Received: by 10.194.246.69 with SMTP id xu5mr2659936wjc.85.1484073358865; Tue, 10 Jan 2017 10:35:58 -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.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 10:35:58 -0800 (PST) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 06/12] btrfs: Make btrfs_delete_delayed_dir_index take btrfs_inode Date: Tue, 10 Jan 2017 20:35:36 +0200 Message-Id: <1484073342-28854-7-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 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 473df414be1b..c7b40613e31c 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1508,18 +1508,18 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info, int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, - struct inode *dir, u64 index) + struct btrfs_inode *dir, u64 index) { struct btrfs_delayed_node *node; struct btrfs_delayed_item *item; struct btrfs_key item_key; int ret; - node = btrfs_get_or_create_delayed_node(BTRFS_I(dir)); + node = btrfs_get_or_create_delayed_node(dir); if (IS_ERR(node)) return PTR_ERR(node); - item_key.objectid = btrfs_ino(BTRFS_I(dir)); + item_key.objectid = btrfs_ino(dir); item_key.type = BTRFS_DIR_INDEX_KEY; item_key.offset = index; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index 3cbd9bb79713..adf6a8a0b23a 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -107,7 +107,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, - struct inode *dir, u64 index); + struct btrfs_inode *dir, u64 index); int btrfs_inode_delayed_dir_index_count(struct inode *inode); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6818a09a0317..d5ca388ae710 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4061,7 +4061,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, goto err; } skip_backref: - ret = btrfs_delete_delayed_dir_index(trans, fs_info, dir, index); + ret = btrfs_delete_delayed_dir_index(trans, fs_info, BTRFS_I(dir), index); if (ret) { btrfs_abort_transaction(trans, ret); goto err; @@ -4225,7 +4225,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, } btrfs_release_path(path); - ret = btrfs_delete_delayed_dir_index(trans, fs_info, dir, index); + ret = btrfs_delete_delayed_dir_index(trans, fs_info, BTRFS_I(dir), index); if (ret) { btrfs_abort_transaction(trans, ret); goto out;