diff options
| author |   NeilBrown <neilb@suse.de> | 2022-05-09 18:20:48 -0700 |
|---|---|---|
| committer |   akpm <akpm@linux-foundation.org> | 2022-05-09 18:20:48 -0700 |
| commit | eb79f3af9395fbe448e91b0940a6c395b7d06be4 (patch) | |
| tree | dacc763dbfc9f748ee7ce3f1588089800705beb1 /fs/nfs/file.c | |
| parent | mm: introduce ->swap_rw and use it for reads from SWP_FS_OPS swap-space (diff) | |
| download | linux-dev-eb79f3af9395fbe448e91b0940a6c395b7d06be4.tar.xz linux-dev-eb79f3af9395fbe448e91b0940a6c395b7d06be4.zip | |
nfs: rename nfs_direct_IO and use as ->swap_rw
The nfs_direct_IO() exists to support SWAP IO, but hasn't worked for a
while. We now need a ->swap_rw function which behaves slightly
differently, returning zero for success rather than a byte count.
So modify nfs_direct_IO accordingly, rename it, and use it as the
->swap_rw function.
Link: https://lkml.kernel.org/r/165119301493.15698.7491285551903597618.stgit@noble.brown
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> (on Renesas RSK+RZA1 with 32 MiB of SDRAM)
Cc: David Howells <dhowells@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 55bc8c8ca71a..0e7686a5d0de 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -488,10 +488,6 @@ static int nfs_swap_activate(struct swap_info_struct *sis, struct file *file, struct rpc_clnt *clnt = NFS_CLIENT(inode); struct nfs_client *cl = NFS_SERVER(inode)->nfs_client; - if (!file->f_mapping->a_ops->swap_rw) - /* Cannot support swap */ - return -EINVAL; - spin_lock(&inode->i_lock); blocks = inode->i_blocks; isize = inode->i_size; @@ -549,6 +545,7 @@ const struct address_space_operations nfs_file_aops = { .error_remove_page = generic_error_remove_page, .swap_activate = nfs_swap_activate, .swap_deactivate = nfs_swap_deactivate, + .swap_rw = nfs_swap_rw, }; /* |