Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2623830pxj; Mon, 31 May 2021 06:49:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMkeBZyjSRAioXaq5zMB5gKpzNkJalfe64bYGVFfShFm5IaON0b4gFoHUUcQWi2voMLR/H X-Received: by 2002:a02:b68c:: with SMTP id i12mr20117371jam.133.1622468972294; Mon, 31 May 2021 06:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622468972; cv=none; d=google.com; s=arc-20160816; b=qygb20WDlek3tKKPiJJ4PlQccfpyQ9OXHLDaGhs3udqcC8YvRX3KWAEI9X/JMX9dWE 2mCLeUxHEfxYV1P2a2ySJz7Hcs5Fx6dPU00tdF4tEhJZAe66jibYMTwyoxk0tJrgA6XW AgZhA+ciXn3j1SwnRrXyp7+pVR7LYqGtlAi41TjWkrHGlAUnolSCE3D6f6vtLXHbeLqo BpzddMpaXF764puGg5B68xX8Z7M69sAUqfI9w2Aua/N+SJPgnXGYc7awq2Xtq5Q1XL99 ygHal6xZ/TTUO0XVyRwSU2CYHruN++nFAojr9qRuQq4N7BQRJvcxhG4VFH6hrE2bLdQS bT3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MEW+deoTpFBb2XcVp47c1+TwDBAzCUc9PaHvUswYm/k=; b=wv8hH5TR5aKjk3NcwRFjrxdYszeQB6Bo7NTAziZB3I28fFY14hh2YaSsd4VVsgIeU/ C3YFcl2coYr2+9QsQLUKK6tCCtXj1c0TVQLZs1y0S55KOsptVpa/Xqg2IomqkabI95uQ J5fSLAd2Atv/F6RRV2cygVKKMBPIY264xiOt0u9FCpeUrTUye0HDx3NaGB8Gf4+cRynu 9vx6wcQG/3qC6nXr2t6I5yST5zXdhRhaOIhlsuiG4wIuJN6bGD41S3M7s5GsT4Ha3ENl kVmNLtAJpFtPTBL0f925Nc4CuH5sD7BfUVdcHza1f7+Lo6nsdsIy3hQQCTB+xdAJy9mb aHbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aMW9bn0C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x99si13489670jah.122.2021.05.31.06.49.18; Mon, 31 May 2021 06:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aMW9bn0C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233121AbhEaNt6 (ORCPT + 99 others); Mon, 31 May 2021 09:49:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:38512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232749AbhEaNe2 (ORCPT ); Mon, 31 May 2021 09:34:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0C9C7613FA; Mon, 31 May 2021 13:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622467502; bh=p2V8FW946HAQAcQlj3WWOfmp0I6aEIEC/WxxkIaR6kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aMW9bn0Cfsbdi7TLyz3rsO5QMLVpM2TU6Dbnr2c6njfSabIbZtI09KQzFxpjlHc3G sDnBkPAB+n6Vf3mIAmhLDYyqzQYDmr4svnS3ISeLDMJ8DVffIkhIitSZdWS+H8t3Pl w2wRE3wNN3u4c3hq3/efKCdF0bK32ImR1apbYvWE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 4.19 089/116] btrfs: do not BUG_ON in link_to_fixup_dir Date: Mon, 31 May 2021 15:14:25 +0200 Message-Id: <20210531130643.161305310@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130640.131924542@linuxfoundation.org> References: <20210531130640.131924542@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik [ Upstream commit 91df99a6eb50d5a1bc70fff4a09a0b7ae6aab96d ] While doing error injection testing I got the following panic kernel BUG at fs/btrfs/tree-log.c:1862! invalid opcode: 0000 [#1] SMP NOPTI CPU: 1 PID: 7836 Comm: mount Not tainted 5.13.0-rc1+ #305 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014 RIP: 0010:link_to_fixup_dir+0xd5/0xe0 RSP: 0018:ffffb5800180fa30 EFLAGS: 00010216 RAX: fffffffffffffffb RBX: 00000000fffffffb RCX: ffff8f595287faf0 RDX: ffffb5800180fa37 RSI: ffff8f5954978800 RDI: 0000000000000000 RBP: ffff8f5953af9450 R08: 0000000000000019 R09: 0000000000000001 R10: 000151f408682970 R11: 0000000120021001 R12: ffff8f5954978800 R13: ffff8f595287faf0 R14: ffff8f5953c77dd0 R15: 0000000000000065 FS: 00007fc5284c8c40(0000) GS:ffff8f59bbd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fc5287f47c0 CR3: 000000011275e002 CR4: 0000000000370ee0 Call Trace: replay_one_buffer+0x409/0x470 ? btree_read_extent_buffer_pages+0xd0/0x110 walk_up_log_tree+0x157/0x1e0 walk_log_tree+0xa6/0x1d0 btrfs_recover_log_trees+0x1da/0x360 ? replay_one_extent+0x7b0/0x7b0 open_ctree+0x1486/0x1720 btrfs_mount_root.cold+0x12/0xea ? __kmalloc_track_caller+0x12f/0x240 legacy_get_tree+0x24/0x40 vfs_get_tree+0x22/0xb0 vfs_kern_mount.part.0+0x71/0xb0 btrfs_mount+0x10d/0x380 ? vfs_parse_fs_string+0x4d/0x90 legacy_get_tree+0x24/0x40 vfs_get_tree+0x22/0xb0 path_mount+0x433/0xa10 __x64_sys_mount+0xe3/0x120 do_syscall_64+0x3d/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae We can get -EIO or any number of legitimate errors from btrfs_search_slot(), panicing here is not the appropriate response. The error path for this code handles errors properly, simply return the error. Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/tree-log.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 7b940264c7b9..1cd610ddbb24 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1770,8 +1770,6 @@ static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans, ret = btrfs_update_inode(trans, root, inode); } else if (ret == -EEXIST) { ret = 0; - } else { - BUG(); /* Logic Error */ } iput(inode); -- 2.30.2