Message ID | 20200218190429.869894993@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=OEC5=4G=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 C4DCCC34047 for <stable@archiver.kernel.org>; Tue, 18 Feb 2020 20:06:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F81222B48 for <stable@archiver.kernel.org>; Tue, 18 Feb 2020 20:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056413; bh=RrjwY8iUS2uLbXYQfD3W83BApgHzmS8EhIQvGuq9OQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OVf6+smNbdaBO5l7y5jE8fFJvrepLaYGbYmMyWXlFrHIqOYtsY7gYBgEXks2lx6fg RUwvV5l7Wsb+Eo/SGBe7uNtkC+Iuxdp6Md0igexK8jqp2lWbbULgTILq0PJiAGr/vD pIAHpwt1iEhcHYD7075mxShJUQMa7842o5R6gyFA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727935AbgBRT7q (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 18 Feb 2020 14:59:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:38596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726680AbgBRT7p (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 18 Feb 2020 14:59:45 -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 04FA424655; Tue, 18 Feb 2020 19:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582055984; bh=RrjwY8iUS2uLbXYQfD3W83BApgHzmS8EhIQvGuq9OQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kwN8qoER9LXBTKVaZr5JtgP+LPxvAk/a4glzRnAO6qPbdzzGf6eRpuWd4DNIRlDue T3OT5RnQH26CXxvQonnz3ifWaw301CbZ5CkTw01cPV+C9lqgrtj+MpOJA2dC4W482V ixZ8E3VZGHlzhvE34iJV8rTlF9pODhyYmAQOePFQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, ryusuke1925 <st13s20@gm.ibaraki-ct.ac.jp>, Koki Mitani <koki.mitani.xg@hco.ntt.co.jp>, Josef Bacik <josef@toxicpanda.com>, Filipe Manana <fdmanana@suse.com>, David Sterba <dsterba@suse.com> Subject: [PATCH 5.4 19/66] Btrfs: fix race between using extent maps and merging them Date: Tue, 18 Feb 2020 20:54:46 +0100 Message-Id: <20200218190429.869894993@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190428.035153861@linuxfoundation.org> References: <20200218190428.035153861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -233,6 +233,17 @@ static void try_merge_map(struct extent_ struct extent_map *merge = NULL; struct rb_node *rb; + /* + * We can't modify an extent map that is in the tree and that is being + * used by another task, as it can cause that other task to see it in + * inconsistent state during the merging. We always have 1 reference for + * the tree and 1 for this task (which is unpinning the extent map or + * clearing the logging flag), so anything > 2 means it's being used by + * other tasks too. + */ + if (refcount_read(&em->refs) > 2) + return; + if (em->start != 0) { rb = rb_prev(&em->rb_node); if (rb)