Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp2050481lqa; Tue, 30 Apr 2024 07:06:55 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWJ9uzxxWSThp8rL51klJMeSUg8QZzzoPFBVRmPoHwHmq+utdgmdZu4+zZxZoSMasGVHhZKUQK0JTC1a481FJ2CPAePwSurQ/YVFuZhYA== X-Google-Smtp-Source: AGHT+IH8INYIjeZNNYtD11m49ciobEDIz+R9JYfles0gdicTHuIuyMvyI3FZGjI2EYHYs0G2dF5N X-Received: by 2002:a17:903:2405:b0:1e0:1a1f:5e4 with SMTP id e5-20020a170903240500b001e01a1f05e4mr16682918plo.55.1714486014859; Tue, 30 Apr 2024 07:06:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714486014; cv=pass; d=google.com; s=arc-20160816; b=kKQ18uyVvtNNh95xXC3F/LBtBc0Dtcl7E6g0vB66DQOs9n5fu5S4DadSb62XQAnesg L1YSsOGAsDpCFJ7woBajdI9vYl7Qv/rQJPJydxto6PbYJTP/L3k+okP9uMCKZMwBq7YC L8yEPuhDmqr1Evvhf/72YwO4SBcKEc7TzeH3h75513/Xln/CMOy++2idJeXZzlMOYJLl Q9KoHgenAPH8mIGyF37Q4HrriSbWN2Z5JGJEo7E3NHuByRhg7ajdeo26sO9v2Zw8dt1W stp6Div6OchvfLydgwYGVImApzIyOHMfNgSESet4HnIKMLRuy60d+NbNAfx+diQD7NZ8 F/mw== 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=Y5HxCXDzpqOEfu0xojuMgcPT8/pbL4JZTgriDkh1jtbvim31c6KrtY64gN1ZJClzwr 70S4DrBJgJA01cT30IEPKioPMWpJ6z9mOnBiAlldcK4S1TBaLnygzkcQoZ46bCTPSpkn vzJhKO9pYUYoUC70FfXbSGSTHKn0utpL98WQ776ZHX0utonkZrGr58ls+tSdPWjcPbkd GyLr53a9aQhPNvkSDCvn9RhGLJ+yq/o2VXcZA74/57A/FM78nogqZELaxxN+swm7etiq uO1km1nakO5X22atNTHwPK03z2553N0E/30AUm0W7+3dnTAA6ZTSgvDJkIMF5uaEl1XM A5/g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RxBGWkS2; 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-3085-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-nfs+bounces-3085-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. [139.178.88.99]) by mx.google.com with ESMTPS id n1-20020a170902f60100b001eb16303eb5si7803549plg.286.2024.04.30.07.06.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 07:06:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs+bounces-3085-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RxBGWkS2; 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-3085-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-nfs+bounces-3085-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 0927A28489B for ; Tue, 30 Apr 2024 14:06:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 08641181BA8; Tue, 30 Apr 2024 14:01:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RxBGWkS2" 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 85D44181339 for ; Tue, 30 Apr 2024 14:01:47 +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=1714485708; cv=none; b=Ol5tBWzuLNfn99NgCgeSMbDc7qYBtF+u6zGhyeqj7sWoT4N2OVjOvhzstAAByj231KXomNKa49IvY2HO8TULKIIHnVMAiv1vfzyXbKJYobjdt4EDUzPBaXOSWPxSqu1TC3pyDuDujbe/dABMfSNxuFROTVhAlAqmS+IKrYmWlrU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714485708; c=relaxed/simple; bh=PB7SnwgwSuhIThU7zY8GpB9n+FiBFKNy4XU+/XyZBBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OVsaZu+tmUR9dM2LuS6FwSL4O0LDkiE6wGELHUp9zsldK6wxg8J8+2Mz5p6wl3Fa7Ix2f5YOuLLUFQ1FjrMKsKQgxGAYMXCvWmHfxjiDhimdgQxnDGEAQ6kF77BNC++TixP3jwYuiHgfZtbrXOL2G5muiqngrQU/+zs6a3j/kMc= 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=RxBGWkS2; 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=1714485706; 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=RxBGWkS2/5uoDWxO8kwF8lhzLABRHAOxEUtrXyfkWwwuEijzJL3bDRmjNDCfjgphZ45QcM vWNXvFLkEIIWmd2wgz8yyo+pZL80kOr0k/ZS4U+NlFDZc4TI4QteuvX4OBxkudniEZVYYT 0A7oypGb4ONLOizc/Lqc2ZsX5HLQYPs= 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-284-oZEuSy0zPnaGWzXYr0XEnQ-1; Tue, 30 Apr 2024 10:01:39 -0400 X-MC-Unique: oZEuSy0zPnaGWzXYr0XEnQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 B246C29AC019; Tue, 30 Apr 2024 14:01:36 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01FC340BAA2; Tue, 30 Apr 2024 14:01:32 +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 v2 08/22] 9p: Use alternative invalidation to using launder_folio Date: Tue, 30 Apr 2024 15:00:39 +0100 Message-ID: <20240430140056.261997-9-dhowells@redhat.com> In-Reply-To: <20240430140056.261997-1-dhowells@redhat.com> References: <20240430140056.261997-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.10 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, };