Received: by 2002:ab2:b82:0:b0:1f3:401:3cfb with SMTP id 2csp568044lqh; Thu, 28 Mar 2024 09:40:28 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXbgsx2L3EZ3vnC4kRhd9XAOWcIx6nyEKS8+sZiWerlp0xzV+c0SqsI9ax/Dvhrq45r1T8ea7ZvFrqJVMiPQKcf8rKIqi8AK6qwnW3Z6g== X-Google-Smtp-Source: AGHT+IH1alqQFswwVnoc2eLI7jlVLT9HNWwSzpspRueJM02TgtqrnFeM0IlymuWAjdMZWJ9Bifvd X-Received: by 2002:a17:90b:c15:b0:2a0:341a:36cc with SMTP id bp21-20020a17090b0c1500b002a0341a36ccmr2872887pjb.3.1711644027770; Thu, 28 Mar 2024 09:40:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711644027; cv=pass; d=google.com; s=arc-20160816; b=s+0OQ5KO9ZzQRGLj+f9/461CiAu/zIgg4gvb/SWp94sFwbrI/n+MFc7cDFS5L0tqwU 8r9RK5XCKMk10H3inXttSvx0+5uT4HE4MY1u6nmZ4eqGQM+8PgBE81iSUEUiH8+OmSeJ ncFCvNhcNbBzXMuOuKwFDRx8FsbUtdaZInvNPjwL+qFDLOM+2tEn89htjPlScGe+0a7t jpjy38rq72GS+fzIxlJeIV4ngzjvh18+r+wymYmU2Tq5ixDdVsuMMCD0d523jcEUB1gj PSdFCSmIe0oqkIi3/QTsaw2+DltZP82bicqPXMbRai4Xre7+bR6WvmtSGJaxERMJSWHO uTBQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=83auCTKPJvOhAjo7iO96K59ucStUj2OSCQeoe5vc/FY=; fh=MRByWdGD0e7LCOwxmXv5cYQpukVa0xHJcjZh5lBl/ic=; b=qcz00bTiaGrmFaaO3NvAjQg+HrlLGCGoWOVmz/PHzuw8XjyRIsi3Rmp8rdFxhXrPom XbvCuOI4H9Erikn2vTd1E26RkfesQyRl+LdhCFycDI2kPaJpJ3vHQTqNIVIwVAymsmNw PoOT7DGHZBUe5k30+pz71GCKGfSIQqyUXT/DXafxmlf1FBRWr73H4QlAfc+KZxXf8m4f DW0COkhlx5QT2iFvwQmeA1HaanzZ7bDVU2DhqeW837HUCqy7meVZ9bsuQBSdFWPfFwJK Mtrp5mf8/GvY+fagDxqxEgTQq1BDoAj9nZu97IA3ZkMjWAspdpDXtMaQuSISOXBuJZNr TG4A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZmiG1GOZ; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-nfs+bounces-2529-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2529-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id na6-20020a17090b4c0600b002a01941b7adsi4278615pjb.0.2024.03.28.09.40.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 09:40:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs+bounces-2529-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZmiG1GOZ; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-nfs+bounces-2529-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2529-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 76D4C294D7C for ; Thu, 28 Mar 2024 16:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 18D591384A3; Thu, 28 Mar 2024 16:37:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZmiG1GOZ" X-Original-To: linux-nfs@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 6639112A154 for ; Thu, 28 Mar 2024 16:37:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643826; cv=none; b=oniRcKKrGRDr2/IqQGjZTQNkx3+AwcU0L361ruw9Gy0aUr0wkIob+rvIGVFxHFBXhhg2lddUeavT1b+fNTDoyo5P43z7LQg2kcVvXGcAMYsgO/5o0Of2VbVcwsNpYYcsQgADN8df0QUHi6GqD86rJgTN/Vy813VefMXzomziTZc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643826; c=relaxed/simple; bh=PB7SnwgwSuhIThU7zY8GpB9n+FiBFKNy4XU+/XyZBBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XDg+ilYcB2lMDDRp5bKBcU+gXZiD3SQwYuUaVygxkwdUU8PN0HqQL9p7co+U8ckmVM/ZVydgFi4Yad0Sn9IbdxdzcDDikr/7xEyofpwird9D0DT71LFY4IZmS+3ZxPdJIJ9ZY+cGbq3XdTvRDdp0D9Err0ZTVCSv5t2dWZvPeyQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZmiG1GOZ; arc=none smtp.client-ip=170.10.133.124 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=1711643824; 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=83auCTKPJvOhAjo7iO96K59ucStUj2OSCQeoe5vc/FY=; b=ZmiG1GOZLCjwBMM6UUko3RHGO6ip5zUYh0/uwXBkzQ1M0bFzlw72HO5brBEyLsIV00tjtd XSLzcE4SEkBHjZL4qrYr0+Kf0x2JAV6QegYjEep/yROPWVpg0Az5eUDtnk8LHfkTMSbxlU bsFQqvuDtaOSpbu6UF6Bstdj0tjQPjs= 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-646-CkA_MFrAM2-Rxey8z_hUEw-1; Thu, 28 Mar 2024 12:37:00 -0400 X-MC-Unique: CkA_MFrAM2-Rxey8z_hUEw-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 0BD532824778; Thu, 28 Mar 2024 16:36:59 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id E197CC37A83; Thu, 28 Mar 2024 16:36:55 +0000 (UTC) From: David Howells To: Christian Brauner , Jeff Layton , Gao Xiang , Dominique Martinet Cc: David Howells , Matthew Wilcox , Steve French , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, 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, Latchesar Ionkov , Christian Schoenebeck Subject: [PATCH 11/26] 9p: Use alternative invalidation to using launder_folio Date: Thu, 28 Mar 2024 16:34:03 +0000 Message-ID: <20240328163424.2781320-12-dhowells@redhat.com> In-Reply-To: <20240328163424.2781320-1-dhowells@redhat.com> References: <20240328163424.2781320-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Use writepages-based flushing invalidation instead of invalidate_inode_pages2() and ->launder_folio(). This will allow ->launder_folio() to be removed eventually. Signed-off-by: David Howells cc: Eric Van Hensbergen cc: Latchesar Ionkov cc: Dominique Martinet cc: Christian Schoenebeck cc: Jeff Layton cc: v9fs@lists.linux.dev cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/9p/vfs_addr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 047855033d32..5a943c122d83 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -89,7 +89,6 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) bool writing = (rreq->origin == NETFS_READ_FOR_WRITE || rreq->origin == NETFS_WRITEBACK || rreq->origin == NETFS_WRITETHROUGH || - rreq->origin == NETFS_LAUNDER_WRITE || rreq->origin == NETFS_UNBUFFERED_WRITE || rreq->origin == NETFS_DIO_WRITE); @@ -141,7 +140,6 @@ const struct address_space_operations v9fs_addr_operations = { .dirty_folio = netfs_dirty_folio, .release_folio = netfs_release_folio, .invalidate_folio = netfs_invalidate_folio, - .launder_folio = netfs_launder_folio, .direct_IO = noop_direct_IO, .writepages = netfs_writepages, };