Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp1181494ybf; Thu, 27 Feb 2020 06:26:09 -0800 (PST) X-Google-Smtp-Source: APXvYqzJf2mVQ0fAWGl0mh42VJD1xf+AolF/fO+maxZAtTbll094ki5xp5Qz20qnMA67njtefFPk X-Received: by 2002:a9d:6f85:: with SMTP id h5mr3541507otq.19.1582813569387; Thu, 27 Feb 2020 06:26:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582813569; cv=none; d=google.com; s=arc-20160816; b=nLMxWkgLOtKAn8Q6z5bYKi68vgrZ5fkV/u1YEF6TUdnfB3lGvc0J820T7X76KXfCHu 6GBwFLKEB796kYIaUx7Sm36/zaoJqUIgEO9U9D3ON0De/9JVC6t9NYfrxhLU43qD/OBz /ARx8lGBNLMlYzRLhDmaGbdzfscHXyf6OLh98KcG2pr9nBad32Vb/ag7FAhY5g9AkDmx OeI2RWZXfQ6aBRRwuRF45wWCxSI7UnyX4aUrJ1eSWexc+RZmhIDQ8U0yNEGXyHzfYHNm EIIOwWA9oct/4L1udqmKrdrTeYMwQVQx0YHwYcGr34aKSZLtgkG5HEVz7QncTgwDCOyT AtEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jTJnOjG7jEvUh+SVP/nzSgyEXEQvFZHSZKji9gILu+A=; b=rzQeiTby313VyJC3yihZvE0srDi1GoNPzsV8PTAfsRH/eAoS2KQBsDWLv6cTBs0biS n92K7ue4SESgpUTNrWWXdAofZtDnbx8fUnKWVCoKCmFwZj1t8uTi9bRrXuerZmoExY0V RopcLXmUKZ9LTM2Geei4Cuko5dr0P92FQK51y4PLJh6X+rckA6CXJfEIFRWvC5sCH/Xn nQlXGqzhHKK9ps1N35LnAML+hVwVrVBetivW0mC9fjBmunjMmdV36B119UfkHZYHXweo +fRG6WiU2AH6xzL5ZzNwhxpFiokBSJd6cu2JjmWfShccxyDPsUvm2gxthVNT6EKbb2xO Tn2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BClGrV7M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24si991814oij.155.2020.02.27.06.25.57; Thu, 27 Feb 2020 06:26:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BClGrV7M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388726AbgB0ONR (ORCPT + 99 others); Thu, 27 Feb 2020 09:13:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:52096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388567AbgB0ONL (ORCPT ); Thu, 27 Feb 2020 09:13:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68458246A0; Thu, 27 Feb 2020 14:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812790; bh=brj/SN8Nv5cyMyCMHkqbOVzue6B+jN0Rrn+n6DFRH50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BClGrV7MMfc22cQpX80ZRe8/4QMG8vgW/+44jex1nJ5UhC7QmDXObHhRM9fiCs78r qp4gu8UB45SA+FwV/eLg72FfgSEYqZeddKXEVtlSiV+CRv7FBXKPdXogpaDxo2Mmv8 lsP2pCetBwgc9B2A/lJE/ieB/80eOjovVAwjtiGM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Nikolay Borisov , Qu Wenruo , Josef Bacik , David Sterba Subject: [PATCH 5.5 018/150] btrfs: handle logged extent failure properly Date: Thu, 27 Feb 2020 14:35:55 +0100 Message-Id: <20200227132235.357370622@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik commit bd727173e4432fe6cb70ba108dc1f3602c5409d7 upstream. If we're allocating a logged extent we attempt to insert an extent record for the file extent directly. We increase space_info->bytes_reserved, because the extent entry addition will call btrfs_update_block_group(), which will convert the ->bytes_reserved to ->bytes_used. However if we fail at any point while inserting the extent entry we will bail and leave space on ->bytes_reserved, which will trigger a WARN_ON() on umount. Fix this by pinning the space if we fail to insert, which is what happens in every other failure case that involves adding the extent entry. CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent-tree.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4430,6 +4430,8 @@ int btrfs_alloc_logged_file_extent(struc ret = alloc_reserved_file_extent(trans, 0, root_objectid, 0, owner, offset, ins, 1); + if (ret) + btrfs_pin_extent(fs_info, ins->objectid, ins->offset, 1); btrfs_put_block_group(block_group); return ret; }