From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F872C2D0EC for ; Fri, 10 Apr 2020 03:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6530F20CC7 for ; Fri, 10 Apr 2020 03:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490761; bh=wHDd2d+jkXhxhCVjA+8NO6T+ZNnc8dgH7MLmOLl3vi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TY/b35BIkLJK38Z1s/4Xy7MD6Gtf3XZsyNJktYB+wlohBrKJ1lQEj6V2+Ed4S21b3 SReKkt11gJx3Nh1/kBJ6+0kFmTQh02YFlc7hSzocd2GVMN+Dh883Fq+U+q3OIf5tbK tjY6nbJ2MNGOky7Sv3GFM2/Bih+p1CBSPH33M46M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728811AbgDJDwk (ORCPT ); Thu, 9 Apr 2020 23:52:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:36160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728363AbgDJDvH (ORCPT ); Thu, 9 Apr 2020 23:51:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 363B321655; Fri, 10 Apr 2020 03:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490667; bh=wHDd2d+jkXhxhCVjA+8NO6T+ZNnc8dgH7MLmOLl3vi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NPy7Hyexr/sUkZId5wxzkpLAccHqMm/WUeyrYWerVvUdjxw3QDjxqaxYwaiyjq0Zw dmRZJ9xQcQoMJZ6yd3mWqDs51lL0oBKhPTBEvoSRwOtcrC1RHGi79XG43Lf8PjgPtT 3R3Ol+2UUz5KabySZmLYvlkLaP3KdogaNzCD7BQI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , David Sterba , Sasha Levin , linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 20/22] btrfs: hold a ref on the root in btrfs_recover_relocation Date: Thu, 9 Apr 2020 23:50:42 -0400 Message-Id: <20200410035044.9698-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200410035044.9698-1-sashal@kernel.org> References: <20200410035044.9698-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Josef Bacik [ Upstream commit 932fd26df8125a5b14438563c4d3e33f59ba80f7 ] We look up the fs root in various places in here when recovering from a crashed relcoation. Make sure we hold a ref on the root whenever we look them up. Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/relocation.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index d4c00edd16d2b..ef83fb0ffc784 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4541,6 +4541,12 @@ int btrfs_recover_relocation(struct btrfs_root *root) err = ret; goto out; } + } else { + if (!btrfs_grab_fs_root(fs_root)) { + err = -ENOENT; + goto out; + } + btrfs_put_fs_root(fs_root); } } @@ -4590,10 +4596,15 @@ int btrfs_recover_relocation(struct btrfs_root *root) list_add_tail(&reloc_root->root_list, &reloc_roots); goto out_free; } + if (!btrfs_grab_fs_root(fs_root)) { + err = -ENOENT; + goto out_free; + } err = __add_reloc_root(reloc_root); BUG_ON(err < 0); /* -ENOMEM or logic error */ fs_root->reloc_root = reloc_root; + btrfs_put_fs_root(fs_root); } err = btrfs_commit_transaction(trans); @@ -4621,10 +4632,14 @@ int btrfs_recover_relocation(struct btrfs_root *root) if (err == 0) { /* cleanup orphan inode in data relocation tree */ fs_root = read_fs_root(fs_info, BTRFS_DATA_RELOC_TREE_OBJECTID); - if (IS_ERR(fs_root)) + if (IS_ERR(fs_root)) { err = PTR_ERR(fs_root); - else - err = btrfs_orphan_cleanup(fs_root); + } else { + if (btrfs_grab_fs_root(fs_root)) { + err = btrfs_orphan_cleanup(fs_root); + btrfs_put_fs_root(fs_root); + } + } } return err; } -- 2.20.1