Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp778470rdb; Fri, 22 Dec 2023 05:02:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1Q333IQiirw8pR59jy9nTrNI/3SeLyLyPcyVpWbsSQFrjOVludLrWny/hVxEnCHAeGuVT X-Received: by 2002:a17:907:718d:b0:a23:5f5f:cb94 with SMTP id zv13-20020a170907718d00b00a235f5fcb94mr615525ejb.47.1703250166973; Fri, 22 Dec 2023 05:02:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703250166; cv=none; d=google.com; s=arc-20160816; b=c36n51FQSTwkI933sRm3/C4sM9KS0w1w55+3PCrTeKgWLoKOL+gWPW/w7SBWiVn97N jdakQptcJS+cF2L0yDnLfaQgW91JeNVuwgHYZaMP6wetwATf+Gq3BMtHfI/NZXLsoPXR adbNfAxxgPNme1rSBYow1v+LCTEJbsRrf40+9TestBJ+YDPEiIXHiOTqUyuG+Lgpyjcw tdAeLFAU0uZN7QVv75+ajwrztV2N1g7l5fkpDu+wOFvrxnhUOCwTYc52LDWA4e9O5qmu xIDnWJPV62c+Qml37DqqMtB9jDVMaw1nRprpXooUKZ06bwhO+IdGs/EwACQcJUZioogl og2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:content-transfer-encoding:content-id:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:cc:to :references:in-reply-to:from:organization:dkim-signature; bh=2kygMq0mAMv991cW3YZ7Hd3ppnOgYBjhmi7vw/LesYI=; fh=Mwp5jdHBE8+WZ+QhDx0Zvk2DkJu8z45fEMGGbscGfGA=; b=Dkni4bj0LZeVvt0H/EgVvIl2Tw+sjZR/xho91dL5OYMLTLkUzT4slEYeuc1NfYYERs o7IZFzQRdyyCxJ+F8pSawtjc7JoMBmKl8DRSmzNM5HUnHD/RfLuoL1cx2G+KOBWEAc9M EPAvs8uYX+5pJRLuQyiRN/szuEeGVgTqa/C6v46OpCcsrL/m13vIVEtXDx1J6Q5Wu4GN 7KzFZT/eGOAUeSs3vjxl9xKYeX7yxNelrccAPTvCxAppS2U8c+n6sXmdTnWhpsszhQIQ JzxmJFi+HsX9aa5WquLzc0vj6ucoRrahv/YaJCu+R3LiDNB+T1rClLRK8KTlwyr+e/2o MoIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NQMNahIL; spf=pass (google.com: domain of linux-nfs+bounces-776-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-nfs+bounces-776-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id u18-20020a170906409200b00a2332be0217si1714494ejj.817.2023.12.22.05.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 05:02:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs+bounces-776-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NQMNahIL; spf=pass (google.com: domain of linux-nfs+bounces-776-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-nfs+bounces-776-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B03BA1F233C7 for ; Fri, 22 Dec 2023 13:02:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 892C818B0C; Fri, 22 Dec 2023 13:02:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NQMNahIL" X-Original-To: linux-nfs@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 D275D199A4 for ; Fri, 22 Dec 2023 13:02:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703250135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2kygMq0mAMv991cW3YZ7Hd3ppnOgYBjhmi7vw/LesYI=; b=NQMNahILgu3aQbYD3RwVLqx49Kb0QJEdivz2twAyGjHa6qSDNBTLYUKgF8/XeHtVYBwG23 13LoOIPgSk1/yThVctxuhb3ZW+Fg65A0lHF3Z4fJV/jGMRyPAz09wA/66Jb0kIqAvSP3Ug LyVx0B4CVrW72jzYFnomvW9RH6rZUpc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-15--QeBZETQMO6dAe6PTzC6cQ-1; Fri, 22 Dec 2023 08:02:12 -0500 X-MC-Unique: -QeBZETQMO6dAe6PTzC6cQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5329D386914F; Fri, 22 Dec 2023 13:02:11 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82A9251E3; Fri, 22 Dec 2023 13:02:07 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20231221132400.1601991-5-dhowells@redhat.com> References: <20231221132400.1601991-5-dhowells@redhat.com> <20231221132400.1601991-1-dhowells@redhat.com> To: Jeff Layton Cc: dhowells@redhat.com, Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Steve French , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Eric Van Hensbergen , Ilya Dryomov , Christian Brauner , linux-cachefs@redhat.com, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-erofs@lists.ozlabs.org Subject: [PATCH] Fix EROFS Kconfig Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2265064.1703250126.1@warthog.procyon.org.uk> Content-Transfer-Encoding: quoted-printable Date: Fri, 22 Dec 2023 13:02:06 +0000 Message-ID: <2265065.1703250126@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 This needs an additional change (see attached). diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig index 1d318f85232d..1949763e66aa 100644 --- a/fs/erofs/Kconfig +++ b/fs/erofs/Kconfig @@ -114,7 +114,8 @@ config EROFS_FS_ZIP_DEFLATE = config EROFS_FS_ONDEMAND bool "EROFS fscache-based on-demand read support" - depends on CACHEFILES_ONDEMAND && (EROFS_FS=3Dm && FSCACHE || EROFS_FS=3D= y && FSCACHE=3Dy) + depends on CACHEFILES_ONDEMAND && FSCACHE && \ + (EROFS_FS=3Dm && NETFS_SUPPORT || EROFS_FS=3Dy && NETFS_SUPPORT=3Dy) default n help This permits EROFS to use fscache-backed data blobs with on-demand