[11/21] NFS: remove IS_SWAPFILE hack

Message ID	164420916118.29374.2111079497808369007.stgit@noble.brown (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> Subject: [PATCH 11/21] NFS: remove IS_SWAPFILE hack From: NeilBrown <neilb@suse.de> To: Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna.schumaker@netapp.com>, Chuck Lever <chuck.lever@oracle.com>, Andrew Morton <akpm@linux-foundation.org>, Mark Hemment <markhemm@googlemail.com>, Christoph Hellwig <hch@infradead.org>, David Howells <dhowells@redhat.com> Cc: linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Mon, 07 Feb 2022 15:46:01 +1100 Message-ID: <164420916118.29374.2111079497808369007.stgit@noble.brown> In-Reply-To: <164420889455.29374.17958998143835612560.stgit@noble.brown> References: <164420889455.29374.17958998143835612560.stgit@noble.brown> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Repair SWAP-over_NFS \| expand [00/21,V4] Repair SWAP-over_NFS [11/21] NFS: remove IS_SWAPFILE hack [21/21] NFS: swap-out must always use STABLE writes. [20/21] NFS: swap IO handling is slightly different for O_DIRECT IO [19/21] NFS: rename nfs_direct_IO and use as ->swap_rw [18/21] NFSv4: keep state manager thread active if swap is enabled [17/21] SUNRPC: improve 'swap' handling: scheduling and PF_MEMALLOC [16/21] NFS: discard NFS_RPC_SWAPFLAGS and RPC_TASK_ROOTCREDS [15/21] SUNRPC: remove scheduling boost for "SWAPPER" tasks. [14/21] SUNRPC/xprt: async tasks mustn't block waiting for memory [13/21] SUNRPC/auth: async tasks mustn't block waiting for memory [12/21] SUNRPC/call_alloc: async tasks mustn't block waiting for memory [01/21] MM: create new mm/swap.h header file. [10/21] VFS: Add FMODE_CAN_ODIRECT file flag [09/21] MM: submit multipage write for SWP_FS_OPS swap-space [08/21] MM: submit multipage reads for SWP_FS_OPS swap-space [07/21] DOC: update documentation for swap_activate and swap_rw [06/21] MM: perform async writes to SWP_FS_OPS swap-space using ->swap_rw [05/21] MM: introduce ->swap_rw and use it for reads from SWP_FS_OPS swap-space [04/21] MM: reclaim mustn't enter FS for SWP_FS_OPS swap-space [03/21] MM: move responsibility for setting SWP_FS_OPS to ->swap_activate [02/21] MM: drop swap_set_page_dirty

Message ID

164420916118.29374.2111079497808369007.stgit@noble.brown (mailing list archive)

State

New

Headers

Subject: [PATCH 11/21] NFS: remove IS_SWAPFILE hack
From: NeilBrown <neilb@suse.de>
To: Trond Myklebust <trond.myklebust@hammerspace.com>,
 Anna Schumaker <anna.schumaker@netapp.com>,
 Chuck Lever <chuck.lever@oracle.com>,
 Andrew Morton <akpm@linux-foundation.org>,
 Mark Hemment <markhemm@googlemail.com>,
 Christoph Hellwig <hch@infradead.org>, David Howells <dhowells@redhat.com>
Cc: linux-nfs@vger.kernel.org, linux-mm@kvack.org,
 linux-kernel@vger.kernel.org
Date: Mon, 07 Feb 2022 15:46:01 +1100
Message-ID: <164420916118.29374.2111079497808369007.stgit@noble.brown>
In-Reply-To: <164420889455.29374.17958998143835612560.stgit@noble.brown>
References: <164420889455.29374.17958998143835612560.stgit@noble.brown>
User-Agent: StGit/0.23
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

Repair SWAP-over_NFS | expand

Commit Message

NeilBrown Feb. 7, 2022, 4:46 a.m. UTC

This code is pointless as IS_SWAPFILE is always defined.
So remove it.

Suggested-by: Mark Hemment <markhemm@googlemail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: NeilBrown <neilb@suse.de>
---
 fs/nfs/file.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 9e2def045111..4d4750738aeb 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -44,11 +44,6 @@ 
 
 static const struct vm_operations_struct nfs_file_vm_ops;
 
-/* Hack for future NFS swap support */
-#ifndef IS_SWAPFILE
-# define IS_SWAPFILE(inode)	(0)
-#endif
-
 int nfs_check_flags(int flags)
 {
 	if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))

[11/21] NFS: remove IS_SWAPFILE hack

Commit Message

Patch