From patchwork Thu Jan 12 14:00:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9513273 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 5875D60710 for ; Thu, 12 Jan 2017 14:01:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45D8F286B9 for ; Thu, 12 Jan 2017 14:01:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A55A286DA; Thu, 12 Jan 2017 14:01:42 +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 C8F45286B9 for ; Thu, 12 Jan 2017 14:01:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751127AbdALOBj (ORCPT ); Thu, 12 Jan 2017 09:01:39 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34274 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065AbdALOBT (ORCPT ); Thu, 12 Jan 2017 09:01:19 -0500 Received: by mail-wm0-f65.google.com with SMTP id c85so3882867wmi.1 for ; Thu, 12 Jan 2017 06:01:17 -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=fiJvQB3EBqKPUnXJ0Q6l8Cr75La5HlBnNaJh0DMVUag=; b=rTmVIN6UdpXEC95cazygsNWMkYAjRwgmetB7qgOccymtXRCRHvf7woXmy4QTiMCeER tEYZ0QxEvNyXfrenhaVcta9rT8EIkf4zIAUvhFghyQGIre3eLyYaVEEqDbnqvWPjBNze c3slD5tubPlIOmyxTKDpoyNPu0tXxYWCmqOJOxRFwdY9xtF6LvbF57t1AoBT0FTeySv/ lkNKAuo34MgtXm9RWfEAcQqcgPxwTlZACoTCr1Srga1dRDwwzLL6IXEOqHrW8d8oam6M neScRr5Tvw/GD1FF6JrsiHc1Go8MD/N19Hvxy0u2FOE4wB2DGSqxOFelU/WwZ1Mjmap9 sOrA== 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=fiJvQB3EBqKPUnXJ0Q6l8Cr75La5HlBnNaJh0DMVUag=; b=pvLrr65yfQAKOlpgAidCTHaWrZlVuMrTqAoPuFZingg9GHhhP3aMuJ1Vto4E1ojrJQ yX0H0/+KFbKx3zuObZt8Bxf3hwkTSGx9FpPx53hBQkx475NgIGpZ3zT5TwPvl7KeF/Gb jEvibmz97MwKLpWtH3tcSu/YGhExXYCa49GXPfo3Ay/D3DagqPv8B5LClTDKT33yAKY/ r++RsQD9fWdivSHpT6Z8MG+tjOvQIfrmp6tuhYGEhx+y01iTWx9mgeVC6Ar8zVJKeiSg DjY1DJDQAo6k2UpKEn5DWdMxfF2PamrIapTrg6Ds++hsqVsfwtdshslBpBzriDifFo6d /v1A== X-Gm-Message-State: AIkVDXJ5z9TeNARJLEQsoO0ibl0UEcU2AAEsowJk0xhic/Uct493B5T95f4rj0Symwz8TQ== X-Received: by 10.28.137.193 with SMTP id l184mr7926015wmd.88.1484229677058; Thu, 12 Jan 2017 06:01:17 -0800 (PST) Received: from fisk.lan (ivokamhome.ddns.nbis.net. [87.120.136.31]) by smtp.gmail.com with ESMTPSA id y145sm725670wmc.17.2017.01.12.06.01.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jan 2017 06:01:16 -0800 (PST) From: Nikolay Borisov To: dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCH 20/24] btrfs: Make __add_inode_ref take btrfs_inode Date: Thu, 12 Jan 2017 16:00:46 +0200 Message-Id: <1484229650-24554-21-git-send-email-n.borisov.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484229650-24554-1-git-send-email-n.borisov.lkml@gmail.com> References: <1484229650-24554-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 | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 834d90398cb4..a24983cd455c 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -990,7 +990,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, struct btrfs_root *log_root, - struct inode *dir, struct inode *inode, + struct btrfs_inode *dir, struct btrfs_inode *inode, struct extent_buffer *eb, u64 inode_objectid, u64 parent_objectid, u64 ref_index, char *name, int namelen, @@ -1046,12 +1046,11 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, parent_objectid, victim_name, victim_name_len)) { - inc_nlink(inode); + inc_nlink(&inode->vfs_inode); btrfs_release_path(path); - ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), - BTRFS_I(inode), victim_name, - victim_name_len); + ret = btrfs_unlink_inode(trans, root, dir, inode, + victim_name, victim_name_len); kfree(victim_name); if (ret) return ret; @@ -1113,15 +1112,14 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, parent_objectid, victim_name, victim_name_len)) { ret = -ENOENT; - victim_parent = read_one_inode(root, - parent_objectid); + victim_parent = read_one_inode(root, parent_objectid); if (victim_parent) { - inc_nlink(inode); + inc_nlink(&inode->vfs_inode); btrfs_release_path(path); ret = btrfs_unlink_inode(trans, root, BTRFS_I(victim_parent), - BTRFS_I(inode), + inode, victim_name, victim_name_len); if (!ret) @@ -1147,20 +1145,20 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, btrfs_release_path(path); /* look for a conflicting sequence number */ - di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), + di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir), ref_index, name, namelen, 0); if (di && !IS_ERR(di)) { - ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di); + ret = drop_one_dir_item(trans, root, path, dir, di); if (ret) return ret; } btrfs_release_path(path); /* look for a conflicing name */ - di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), + di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir), name, namelen, 0); if (di && !IS_ERR(di)) { - ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di); + ret = drop_one_dir_item(trans, root, path, dir, di); if (ret) return ret; } @@ -1306,7 +1304,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans, if (!search_done) { ret = __add_inode_ref(trans, root, path, log, - dir, inode, eb, + BTRFS_I(dir), BTRFS_I(inode), eb, inode_objectid, parent_objectid, ref_index, name, namelen,