[01/11] NFS: remove IS_SWAPFILE hack

Message ID	164661010493.31054.5415277267173006275.stgit@noble.brown (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-nfs-owner@kernel.org> Subject: [PATCH 01/11] NFS: remove IS_SWAPFILE hack From: NeilBrown <neilb@suse.de> To: Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org> Cc: linux-nfs@vger.kernel.org Date: Mon, 07 Mar 2022 10:41:44 +1100 Message-ID: <164661010493.31054.5415277267173006275.stgit@noble.brown> In-Reply-To: <164660993703.31054.17075972410545449555.stgit@noble.brown> References: <164660993703.31054.17075972410545449555.stgit@noble.brown> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	Various NFS/sunrpc improvements for swap-over-NFS \| expand [00/11] Various NFS/sunrpc improvements for swap-over-NFS [01/11] NFS: remove IS_SWAPFILE hack [02/11] SUNRPC/call_alloc: async tasks mustn't block waiting for memory [03/11] SUNRPC/auth: async tasks mustn't block waiting for memory [04/11] SUNRPC/xprt: async tasks mustn't block waiting for memory [05/11] SUNRPC: remove scheduling boost for "SWAPPER" tasks. [06/11] NFS: discard NFS_RPC_SWAPFLAGS and RPC_TASK_ROOTCREDS [07/11] SUNRPC: improve 'swap' handling: scheduling and PF_MEMALLOC [08/11] NFSv4: keep state manager thread active if swap is enabled [09/11] NFS: swap IO handling is slightly different for O_DIRECT IO [10/11] NFS: swap-out must always use STABLE writes. [11/11] SUNRPC: change locking for xs_swap_enable/disable

Message ID

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

State

New, archived

Headers

Subject: [PATCH 01/11] NFS: remove IS_SWAPFILE hack
From: NeilBrown <neilb@suse.de>
To: Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org
Date: Mon, 07 Mar 2022 10:41:44 +1100
Message-ID: <164661010493.31054.5415277267173006275.stgit@noble.brown>
In-Reply-To: <164660993703.31054.17075972410545449555.stgit@noble.brown>
References: <164660993703.31054.17075972410545449555.stgit@noble.brown>
User-Agent: StGit/0.23
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk

Series

Various NFS/sunrpc improvements for swap-over-NFS | expand

Commit Message

NeilBrown March 6, 2022, 11:41 p.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 76d76acbc594..901f316f084d 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))

[01/11] NFS: remove IS_SWAPFILE hack

Commit Message

Patch