From patchwork Tue Jan 9 11:20:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13514777 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A645C47073 for ; Tue, 9 Jan 2024 11:21:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 944F56B0085; Tue, 9 Jan 2024 06:21:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CDE86B0087; Tue, 9 Jan 2024 06:21:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76E056B0089; Tue, 9 Jan 2024 06:21:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 63F8A6B0085 for ; Tue, 9 Jan 2024 06:21:10 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3B0F9A0134 for ; Tue, 9 Jan 2024 11:21:10 +0000 (UTC) X-FDA: 81659531100.14.92FC087 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 6A10BC0013 for ; Tue, 9 Jan 2024 11:21:08 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YvZbyNVG; spf=pass (imf22.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704799268; a=rsa-sha256; cv=none; b=UsD6cLr/WjmWOpTrnZgBFqlmCowj5mQXagwXkQLrwT5YiQZASCHnGBbsUNqI6VxU829Oad Atr+WGfZQR3NhWj8USKSkTYzu+Hg2aSwQIbgZxALV7oPr6L+vQ72FvWpA+KKdeqs2JHk8A t5pUW/KcmJM5MxGzLXDTcNSqDMEwk5k= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YvZbyNVG; spf=pass (imf22.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704799268; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lTmcWwAowP4sGHH2dBxkB2CC/aMCkpFsy2ZSyWuDsbM=; b=ldV4cAu8+fB/XU8Ams2CLXzmGAEwFH1k+cvtsyqkQmFYacqQne4oiZ1JPErzcMCaLw63Sm +fCH7QqWaG6du2Mgj8njzw7tXX4LISmH/YtBB5Ss6Yn5yS70v0PYNuoKswfTxrb/Nh5G1c c2nCek7LTc/gkvkvs7DKWRXO0CcU+RY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704799267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lTmcWwAowP4sGHH2dBxkB2CC/aMCkpFsy2ZSyWuDsbM=; b=YvZbyNVGKCzBwREJ/gGaI1jtmaquzUVmRYzEyfvy6M0NW2uLfXJY/JhqVe4s8AkIX9TDAC DtHkRl20h9AXGky/w6HJU2qKs69wwAwdY06ATKYuC90jROOH0gKBm6kOMmShBajZeYsvx3 GUyo1al2ABOC6h4VFQjuGlwROtXQgco= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-9U04wNMdOJy50uoFoYMuDQ-1; Tue, 09 Jan 2024 06:21:03 -0500 X-MC-Unique: 9U04wNMdOJy50uoFoYMuDQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 DD86385A588; Tue, 9 Jan 2024 11:21:00 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0990C15E6C; Tue, 9 Jan 2024 11:20:57 +0000 (UTC) From: David Howells To: Christian Brauner , Jeff Layton , Gao Xiang , Dominique Martinet Cc: David Howells , Steve French , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , 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-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH 6/6] netfs: Fix wrong #ifdef hiding wait Date: Tue, 9 Jan 2024 11:20:23 +0000 Message-ID: <20240109112029.1572463-7-dhowells@redhat.com> In-Reply-To: <20240109112029.1572463-1-dhowells@redhat.com> References: <20240109112029.1572463-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6A10BC0013 X-Stat-Signature: mb86o6nwmz8tftm5yyydos31n88nxh95 X-Rspam-User: X-HE-Tag: 1704799268-845980 X-HE-Meta: U2FsdGVkX1+c2nGh9x1OKPR0dGGs29eMH3MIwALJXJSS6zjX91JpFI/jfTm9PNRmtcfwycWV3rxB/X1cxzOvH7cRdDhnwuU6IV1HCJ6olz/uW3mi1u+TiRw0Y6OPNG2l5DF7JTqGoJnMIfMjVd9OhbHx+k+Ul2OJqMbpojPvdC/eIDSAJoOVe/2OPozO0gdW89/C/xkGl37DpD2Knoi9CkWJmOuAdXpJJi42grp0+EAxq5akiUWYFYLGQu5FsSZUxfJwIxrMzW1tFKfmKPIdmd1sj1+xbVnNmBm9kQsbteYH1WBzOQRaFiba7CbuyG0dAeftJCSxKOsleiqYZ5MqL2JxSqFIjOs4wiu30SkPd8mOGXP6+XkzvSMJspu6A8iZsGWk6WV/JQbja00f8Knu1YrDA6iTLsiZiJOee7/OBIlmTSZQdLPS9+CKzn8V7gVPJaZ6zdtDaqTHDM4MqjQtEanbqEJb5fEJvwdOvievzJ81KXtKECXy8nBDyiEBZoYertCsNP0/kIFvoc4w4sFGTcMHpUH1GS1LQVeCg9wzgCW5MG6c4s/lAEzS8Iaw5RZ4IqoDc7COhBrKiz9l3EJ5HKE2Kn0DfIu/crBhikBuZ2vETwxveuZIDsH+Z1HBJdUMZiO3JpwMHekQFgxZ+mg134eW0zk3B6iIrirKZB0mscSg+V7PptUtBvMXvhHRzNGoStShjsOj0MIWeiKEaJjuBan5I4r9o8hXCZzKl97JY5hJZyYYxlxUNmIjMORKlj4nKzcl1750MKgm/ld1p0U7cjFYX6QFCCa4Msf6hZm3F5Drl4xY1xuUSdy/2xUszqec6/qRyZ2Wpq7BdkYcNyJW/eK/yCcSl5nKqRfbFilRkQqe59DlpqkSUgPN/rWsLgknsBrWMJpMHQAi6/juGGgSj2y7bQIhg2Hier/7h7mUFnHkhiv1TP1wHNyewo8KIINnUjuUu9FdRlspDbuIJkH hbIy6t+X J7xUzT4Va1nWMkNKsCwD7h/+9WFH6NXQKkd2Y1Vmbm33+/PZcNMHLQsAxKbk/brsRzwKvtknCBFi0d15Gm8FNk/AHtdHRRAiB/9aifVUrc4wzwgqLDB8Fmrh6vqwg8uA1BQYrWhPMOh4zdO2S3sSffvDSDtAknI1HcRvNYOJIWzugEqmSG25PclMXhXJDRTYgaf4ZCSzCypLW8PJqg5C5YZCvohKquyMe2l5awsOSBbc7r/JP18t+iVLqJN7e/EfVuEbXGeSebKVrnUaysz70tcqgir/RbA4/u4hVRVazXHYLrhJpozynluNzoFBgwfEMtz80yWhxZbOFkQcVinzcUPz7PI9EgrsgLWA1NrEtfKDUOIxCWDRZzB4zO2hfY1gr7q/MZixO6f2uUNfbcAlpV7rTZmDmtaKyKem0rIrXKE+EgN2OBdqevXyfLbyQ4cciZJMUu4pRaLaGAjelnhAl3N6vOnKHMN+LSh1vKOZoYxeE8HBkmvgWtSNrD5Pxc+tqLETD6jeZDrizGzn0QLI4DIirQg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: netfs_writepages_begin() has the wait on the fscache folio conditional on CONFIG_NETFS_FSCACHE - which doesn't exist. Fix it to be conditional on CONFIG_FSCACHE instead. Fixes: 62c3b7481b9a ("netfs: Provide a writepages implementation") Reported-by: Lukas Bulwahn Signed-off-by: David Howells cc: Matthew Wilcox cc: linux-afs@lists.infradead.org cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org Link: https://lore.kernel.org/r/20240109083257.GK132648@kernel.org/ --- fs/netfs/buffered_write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index 0b2b7a60dabc..de517ca70d91 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -1076,7 +1076,7 @@ static ssize_t netfs_writepages_begin(struct address_space *mapping, folio_unlock(folio); if (wbc->sync_mode != WB_SYNC_NONE) { folio_wait_writeback(folio); -#ifdef CONFIG_NETFS_FSCACHE +#ifdef CONFIG_FSCACHE folio_wait_fscache(folio); #endif goto lock_again;