Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2299491imm; Mon, 28 May 2018 05:39:32 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp5BJRtZOzfTrvsI5MHzKgJ3I1cwos7Ma4KYq6p5rpjM388TD/siDN/na5ZWBUgXKMb9QL/ X-Received: by 2002:a63:6106:: with SMTP id v6-v6mr10450749pgb.441.1527511172086; Mon, 28 May 2018 05:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527511172; cv=none; d=google.com; s=arc-20160816; b=ABzT630LwARoDWEAK9NLFnkTRYZNNScUF3aH7Rs/aU4P2z788DHDaL62D9c779oXGa mLHJuPOPEm7PTujw9DjStqcrZ2gHY+foqkOYBw98W6S2Z9UYaPRTkONYYjTJe24Ocv7U J7QdiVXDqUhb/H/bLJOx463NtnUby9ThAnDP9v/PWj9NpNAYy5hyUQoFc4T9wf3rK5UC cJqSvDqhN6zpByePegKAvhBozjgHaT1XoSrA8ZbNHis8J0mepjpHsdE1RQNYpRbkSHNV qpv4o1rbJ6nL6253X204Iyc6ooeH/y/EqF/SUNFeYYyZJayFAbqr7FP8S86VRq05gHlv LLUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=3Wbev6IW0m+6sINXXy14Dg2KU6zNkXFayZgH55UAL1I=; b=aQ+iqDBsDuL6Np0jk9bY6E3XCa0+JLEE7Et1kn+2kfxs3wVJqOjfDhlxveWfxB8PCn RloZ7FFaxzjrfXPbbvvn9fz1Lq1LQOaGG3KkUo3CmrJZjuagzsPoM3jFCetkHjmQxSMX +NTHq+vhssVUl1frJIkANZViYKvxdEbZsUr2ZX6qBhcZ0ZiPFjIiZ+60aXGhcON8bVo1 P8N7SVhVrKyYnigZAXaouPXdVgvFnNUCuuEgTog2pZz3pjx2CTgYp2Xnup67Sd/wIyZ+ Jnsrllp53WLQqrv/xUWGmc2mXPvgpUIxHOet9WpyzUE2kd9/UVLA49RDpXEZavKSo5Az 9dpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BODLhE2M; 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 q17-v6si29391855pff.301.2018.05.28.05.39.17; Mon, 28 May 2018 05:39:32 -0700 (PDT) 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=BODLhE2M; 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 S1164537AbeE1MhU (ORCPT + 99 others); Mon, 28 May 2018 08:37:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:46890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938059AbeE1K6w (ORCPT ); Mon, 28 May 2018 06:58:52 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 5C7DB2088E; Mon, 28 May 2018 10:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505131; bh=/xFGTERWYiG5lyfMtBPkG4mBAb+ZHltahliGUCeTMgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BODLhE2M17woGsj9sszm++d69cZ0SLaxNo7KEa9jWmx6xrTTshKdcOxzO7V6cln+a 9pJZjk35hebR1dP9Z9LCCB8hiU6l6mybj3mYYWOOt6qkhQOM0GGuEX7xZsaLhv9sIc cXSfUV1eQunk5NgCRRRVNvoPOiO6UtnRN9ke+l0E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Justin Maggard , Qu Wenruo , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 4.14 356/496] btrfs: qgroup: Fix root item corruption when multiple same source snapshots are created with quota enabled Date: Mon, 28 May 2018 12:02:21 +0200 Message-Id: <20180528100334.796050429@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qu Wenruo [ Upstream commit 4d31778aa2fa342f5f92ca4025b293a1729161d1 ] When multiple pending snapshots referring to the same source subvolume are executed, enabled quota will cause root item corruption, where root items are using old bytenr (no backref in extent tree). This can be triggered by fstests btrfs/152. The cause is when source subvolume is still dirty, extra commit (simplied transaction commit) of qgroup_account_snapshot() can skip dirty roots not recorded in current transaction, making root item of source subvolume not updated. Fix it by forcing recording source subvolume in current transaction before qgroup sub-transaction commit. Reported-by: Justin Maggard Signed-off-by: Qu Wenruo Reviewed-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/transaction.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -319,7 +319,7 @@ static int record_root_in_trans(struct b if ((test_bit(BTRFS_ROOT_REF_COWS, &root->state) && root->last_trans < trans->transid) || force) { WARN_ON(root == fs_info->extent_root); - WARN_ON(root->commit_root != root->node); + WARN_ON(!force && root->commit_root != root->node); /* * see below for IN_TRANS_SETUP usage rules @@ -1366,6 +1366,14 @@ static int qgroup_account_snapshot(struc return 0; /* + * Ensure dirty @src will be commited. Or, after comming + * commit_fs_roots() and switch_commit_roots(), any dirty but not + * recorded root will never be updated again, causing an outdated root + * item. + */ + record_root_in_trans(trans, src, 1); + + /* * We are going to commit transaction, see btrfs_commit_transaction() * comment for reason locking tree_log_mutex */