Re: [PATCH 06/10] NFS: Allow internal use of read structs and functions

From: David Wysochanski <dwysocha@redhat.com>
To: Trond Myklebust <trondmy@hammerspace.com>,
	Anna Schumaker <anna.schumaker@netapp.com>
Cc: linux-nfs <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 06/10] NFS: Allow internal use of read structs and functions
Date: Fri, 5 Feb 2021 08:47:19 -0500	[thread overview]
Message-ID: <CALF+zOm=rnet4cXpSVs+7azC7P5W8oBgyu+NW8UCGeughCXi5A@mail.gmail.com> (raw)
In-Reply-To: <1611845708-6752-7-git-send-email-dwysocha@redhat.com>

On Thu, Jan 28, 2021 at 9:59 AM Dave Wysochanski <dwysocha@redhat.com> wrote:
>
> The conversion of the NFS read paths to the new fscache API
> will require use of a few read structs and functions,
> so move these declarations as required.
>
> Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
> ---
>  fs/nfs/internal.h |  8 ++++++++
>  fs/nfs/read.c     | 13 ++++---------
>  2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
> index 62d3189745cd..8514d002c922 100644
> --- a/fs/nfs/internal.h
> +++ b/fs/nfs/internal.h
> @@ -457,9 +457,17 @@ extern char *nfs_path(char **p, struct dentry *dentry,
>
>  struct nfs_pgio_completion_ops;
>  /* read.c */
> +extern const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;
>  extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
>                         struct inode *inode, bool force_mds,
>                         const struct nfs_pgio_completion_ops *compl_ops);
> +struct nfs_readdesc {
> +       struct nfs_pageio_descriptor pgio;
> +       struct nfs_open_context *ctx;
> +};
> +extern int readpage_async_filler(void *data, struct page *page);
> +extern void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio,
> +                                    struct inode *inode);
>  extern void nfs_read_prepare(struct rpc_task *task, void *calldata);
>  extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);
>
> diff --git a/fs/nfs/read.c b/fs/nfs/read.c
> index d2b6dce1f99f..9618abf01136 100644
> --- a/fs/nfs/read.c
> +++ b/fs/nfs/read.c
> @@ -30,7 +30,7 @@
>
>  #define NFSDBG_FACILITY                NFSDBG_PAGECACHE
>
> -static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;
> +const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;
>  static const struct nfs_rw_ops nfs_rw_read_ops;
>
>  static struct kmem_cache *nfs_rdata_cachep;
> @@ -74,7 +74,7 @@ void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
>  }
>  EXPORT_SYMBOL_GPL(nfs_pageio_init_read);
>
> -static void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio,
> +void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio,
>                                      struct inode *inode)
>  {
>         struct nfs_pgio_mirror *pgm;
> @@ -132,11 +132,6 @@ static void nfs_readpage_release(struct nfs_page *req, int error)
>         nfs_release_request(req);
>  }
>
> -struct nfs_readdesc {
> -       struct nfs_pageio_descriptor pgio;
> -       struct nfs_open_context *ctx;
> -};
> -
>  static void nfs_page_group_set_uptodate(struct nfs_page *req)
>  {
>         if (nfs_page_group_sync_on_bit(req, PG_UPTODATE))
> @@ -215,7 +210,7 @@ static void nfs_initiate_read(struct nfs_pgio_header *hdr,
>         }
>  }
>
> -static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops = {
> +const struct nfs_pgio_completion_ops nfs_async_read_completion_ops = {
>         .error_cleanup = nfs_async_read_error,
>         .completion = nfs_read_completion,
>  };
> @@ -290,7 +285,7 @@ static void nfs_readpage_result(struct rpc_task *task,
>                 nfs_readpage_retry(task, hdr);
>  }
>
> -static int
> +int
>  readpage_async_filler(void *data, struct page *page)
>  {
>         struct nfs_readdesc *desc = data;
> --
> 1.8.3.1
>

Anna, FYI, you could drop this from your linux-next branch if you want.
Since the fscache conversion patches are not included, we don't really
need this patch.
The other patches 1-5 I are valid cleanups but this really goes with
the conversion patches.
It's your call though.