Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3473991rwa; Tue, 23 Aug 2022 05:28:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR5f3S7+HeytUPmuTSeOXo/80Zk8WyG8UUdjuXlPKPjITEkO0pOpFIgVGkNudpTivWDt8N9o X-Received: by 2002:a17:906:e28e:b0:73d:8cca:2f6 with SMTP id gg14-20020a170906e28e00b0073d8cca02f6mr4820546ejb.621.1661257712687; Tue, 23 Aug 2022 05:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661257712; cv=none; d=google.com; s=arc-20160816; b=D+NTRe5IzAx6w5HkxfOmCxh5ojoSrZAFXBA/dF8K3aNt1qUFt7J8TBkLYsprXuvCQB smUwdjDiEliKRbyHo0RNqyf3X9sPrf/uYOr67ZjD6DXJlK9Xsy/4rnk0HjaSIcHghjXs AGYjr2xW6rkgHqUrK+TR2qFC7OkPKcE6dU6uHQQfkRV6irusQx2Eg8nbaMbZAe3FeQB5 DgUz10OM8SV2rWdfrKd7LYOLCtBQNECssGsI4iGob9p10mGXi8eZlUmk/IYSNhzCv9G0 M3va/NZK+RldjUSetHUedWQkAGRjjPe493F7JixLWVoGta2lrbk8N439kjs8CLY6djL7 6lsA== 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=tT6VU/vXXrOGOwPQ9aJu5g/S1u2AyzezF32gs6XxBWA=; b=vl7nXK4FsUesJiqcLH3cuODZedoHofLJiiCHa6qdUVoaqif4kntIOlN1vwcur+zJum zr0/jhdkdACNieQLlKWsklHAnfq5qHw6RIGeRl6riMX6PQmd4FmSD5MX5sEIrwgEQVKy D0s4y/sqE30E/QG4iZM9WqHFi7Tl4nwR20ljou2Jo1yJTKuQmh9QTQ6OlhZb3gHNdwA9 HjjtqKedO5ar0evgCIN9akxrukM/vW7ulAsaVqCJfWgv4q61H8t33iNQE77q83A4WGHR eJBBi0Jv71OMMrl7pdeMt/HExggU1cVWly+KsoaOGCDE955J3ZEbaw72pyPd/x333bjA FOkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TWGd0CGO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l11-20020a170906794b00b0073d84f1c88csi4984414ejo.240.2022.08.23.05.28.07; Tue, 23 Aug 2022 05:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TWGd0CGO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S1354328AbiHWKc4 (ORCPT + 99 others); Tue, 23 Aug 2022 06:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353441AbiHWKOA (ORCPT ); Tue, 23 Aug 2022 06:14:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38A4972FCF; Tue, 23 Aug 2022 01:59:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D0957B81C28; Tue, 23 Aug 2022 08:59:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32050C433C1; Tue, 23 Aug 2022 08:59:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661245188; bh=EBimmJxbHe39CL+TyotCC12WSqh4D6A6NfBwAC6AG18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TWGd0CGOVFh5BrSfwhbP0KPJumiCc95bw0jb4tTnkNp0uICro80Atpb0cN+rmzhbe Bdi7QM67EdmC0F44ZT4tcALPpgUwK2iQPpK15Iwsp5IfoYoEr4t456K5ZM98o6oZOK VQQT+JJ1jr8HO6S1HsPM83ErcerKNSTKOgbjgYVM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Eric Sandeen , "Darrick J. Wong" , Dave Chinner , Dave Chinner , Leah Rumancik Subject: [PATCH 5.15 243/244] xfs: revert "xfs: actually bump warning counts when we send warnings" Date: Tue, 23 Aug 2022 10:26:42 +0200 Message-Id: <20220823080107.747498057@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Sandeen [ Upstream commit bc37e4fb5cac2925b2e286b1f1d4fc2b519f7d92 ] This reverts commit 4b8628d57b725b32616965e66975fcdebe008fe7. XFS quota has had the concept of a "quota warning limit" since the earliest Irix implementation, but a mechanism for incrementing the warning counter was never implemented, as documented in the xfs_quota(8) man page. We do know from the historical archive that it was never incremented at runtime during quota reservation operations. With this commit, the warning counter quickly increments for every allocation attempt after the user has crossed a quote soft limit threshold, and this in turn transitions the user to hard quota failures, rendering soft quota thresholds and timers useless. This was reported as a regression by users. Because the intended behavior of this warning counter has never been understood or documented, and the result of this change is a regression in soft quota functionality, revert this commit to make soft quota limits and timers operable again. Fixes: 4b8628d57b72 ("xfs: actually bump warning counts when we send warnings) Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner Signed-off-by: Leah Rumancik Acked-by: Darrick J. Wong Signed-off-by: Greg Kroah-Hartman --- fs/xfs/xfs_trans_dquot.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -603,7 +603,6 @@ xfs_dqresv_check( return QUOTA_NL_ISOFTLONGWARN; } - res->warnings++; return QUOTA_NL_ISOFTWARN; }