From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3ED57BB0C; Wed, 21 Feb 2024 13:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523123; cv=none; b=PD7zy5Dxjb0WYYIoUuh1eHh1Br8xEZ+4Yd9N+vTHY5Um6US6NgMl5eOrAuKFBwJItx/w1M59QOgQPEuz9GgfjBfw6yDpj89GI8dKiGOekFgIPKPsIiLHPr6HRosDyd8AO5fwMgw3v25GDmXjPy78a2o2WfuBCW5G3oUY746Cxt8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523123; c=relaxed/simple; bh=ZgSaCyZxtcdNoT3nq6/oG3ezZOqEjssBGRFzt8tKizQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rv8QS1AHWxDGA7KCfLrrrv72yPeE/vvJGtNWVn6osHab5HOQhHzXrM42wlCSuv3lSL8hPBbxpTK3Mt4fkSRHrhTCYejip/1ASLekISyU6BQnkeBg3/uxrRPJcWt7NwNT8b+gQLQP30216W0PH3FEQgxjXbVBICLIvYc0cGpt38A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fzSdPMTJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fzSdPMTJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5189DC433F1; Wed, 21 Feb 2024 13:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708523123; bh=ZgSaCyZxtcdNoT3nq6/oG3ezZOqEjssBGRFzt8tKizQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzSdPMTJc9hujjwgcZEc7Yt1l+1g0JUpYzC3SxeJDCTYwTBPfTj1gc8aJuO/rmSP1 TWpFZ7eV7u6k6a8bsHkI71xY7c7GkfAByR6zF+JYbuVjYwekMiDQaX30IqK7zHoRic WUZ8bvBBifmQ8uUzvv1y4VIjancFmKXDs7p2wwNU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Boris Burkov , David Sterba Subject: [PATCH 5.15 346/476] btrfs: forbid deleting live subvol qgroup Date: Wed, 21 Feb 2024 14:06:37 +0100 Message-ID: <20240221130020.777531144@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Boris Burkov commit a8df35619948bd8363d330c20a90c9a7fbff28c0 upstream. If a subvolume still exists, forbid deleting its qgroup 0/subvolid. This behavior generally leads to incorrect behavior in squotas and doesn't have a legitimate purpose. Fixes: cecbb533b5fc ("btrfs: record simple quota deltas in delayed refs") CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Qu Wenruo Signed-off-by: Boris Burkov Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/qgroup.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1608,6 +1608,15 @@ out: return ret; } +static bool qgroup_has_usage(struct btrfs_qgroup *qgroup) +{ + return (qgroup->rfer > 0 || qgroup->rfer_cmpr > 0 || + qgroup->excl > 0 || qgroup->excl_cmpr > 0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_DATA] > 0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC] > 0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS] > 0); +} + int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) { struct btrfs_fs_info *fs_info = trans->fs_info; @@ -1627,6 +1636,11 @@ int btrfs_remove_qgroup(struct btrfs_tra goto out; } + if (is_fstree(qgroupid) && qgroup_has_usage(qgroup)) { + ret = -EBUSY; + goto out; + } + /* Check if there are no children of this qgroup */ if (!list_empty(&qgroup->members)) { ret = -EBUSY;