From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66BB1C433EF for ; Fri, 5 Nov 2021 10:25:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AEF36124F for ; Fri, 5 Nov 2021 10:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233111AbhKEK1q (ORCPT ); Fri, 5 Nov 2021 06:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233066AbhKEK1p (ORCPT ); Fri, 5 Nov 2021 06:27:45 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA192C061714 for ; Fri, 5 Nov 2021 03:25:05 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id r8so8296838qkp.4 for ; Fri, 05 Nov 2021 03:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Dz8dds0Rn/D4rFasHh96BwfSdSGLmDlGTRd0pT7oXAQ=; b=cOm2KV/7BCZZQiJh7QnV+LeJHbRIPQDc8kplQH0kcQGHgIKDNxYSSsBab56rf5vRKg avGh5MWPTZlg0mcrfd2YSit7hhEI7wC0CrwJK2beK+ZSthVLg8G55vM3JQbKFLMO9gmf 5IG6n8poU5+/HsxlXiyp027cuSaCFRslaFLjewlrX0dVDc1v1yZ7Nx36elNiNxIjLalo U9Ik1j3uJDlWvbiZvrqRXcv+pgJW5rxZt3zwlt+DWggMj4f9gILvTKxj6n09O4jzfy1t T9aJyMmC3+KsacbgWqYNuNQLkr/z56159WI6PiY9pjntkRbGWki+oVm4P8VnRuxgO1k/ eVGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Dz8dds0Rn/D4rFasHh96BwfSdSGLmDlGTRd0pT7oXAQ=; b=Sw9vuyWi2iBdK7UHgfHLKHYwcvV4U0I3VAFO0ct11bAJKYpnfEG/uWADK/6wtCfDhv HJ4Q63k0+vUYaAoT4LtWGN/AplveNeWn85o/lTcipfJTOFAHeFRm/veGGEcH691MD5SS +a9rjB3o2Sgd2EEF4yKLfljIupIdW1Y1eSu9G352mt2wHYe7j891FfldPSrUmWtktAWd Ux9gWdMCcDq5bAhdZSLwuIlB9jOInononyBExzrTNXGVP/U9Rc5uZ6zLLcN2nAnCbdmu 9lNY/pcTP1QBk5oBNsk7m7QOB58YY/53Xwu2d5ny00OcW8UUL/E4Q3KOfUEmHvQ70AZk yCSg== X-Gm-Message-State: AOAM5308nJXaenUeDkVsrpksVZTmP6/X7mIGJwfDUGc6ntPwhtb+jsmQ QQXW9+v8q+InoLwssMPL466USg== X-Google-Smtp-Source: ABdhPJyUbA8qVmO3lqY8kItZUHcuMyuaTZHibRhSnIu8jpgd4MM3N3I8eS7Kl0DvN284kGZXv2W/tQ== X-Received: by 2002:a05:620a:3705:: with SMTP id de5mr10147809qkb.41.1636107905001; Fri, 05 Nov 2021 03:25:05 -0700 (PDT) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id j192sm1903934qke.13.2021.11.05.03.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 03:25:03 -0700 (PDT) Date: Fri, 5 Nov 2021 06:25:02 -0400 From: Josef Bacik To: Qu Wenruo Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Subject: Re: [PATCH] fstests: btrfs: make nospace_cache related test cases to work with latest v2 cache Message-ID: References: <20211104005553.14485-1-wqu@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211104005553.14485-1-wqu@suse.com> Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Thu, Nov 04, 2021 at 08:55:53AM +0800, Qu Wenruo wrote: > In the coming btrfs-progs v5.15 release, mkfs.btrfs will change to use > v2 cache by default. > > However nospace_cache mount option will not work with v2 cache, as it > will make v2 cache out of sync with on-disk used space. > > So mounting a btrfs with v2 cache using "nospace_cache" will make btrfs > to reject the mount. > > There are quite some test cases relying on nospace_cache to prevent v1 > cache to take up data space. > > For that case, we can append "clear_cache" mount option to it, so that > btrfs knows we do not only want to prevent cache from being created, but > also want to clear any existing v2 cache. > > By this, we can keep those existing tests to do the same behavior for > both v1 and v2 cache. > > Signed-off-by: Qu Wenruo This will re-generate the free space tree needlessly, and in fact won't be allowed for extent-tree-v2, so we'll just have to mess with it again. Instead add a helper to get the options if they're needed, something like _btrfs_nocache_opt() { $BTRFS_UTIL_PROG inspect-internal $SCRATCH_DEV | grep FREE_SPACE_TREE if [ $? -eq 0 ]; then return "-o nospace_cache" fi return "" } or something like that. Thanks, Josef