2012-04-30 17:06:56

by Anna Schumaker

Subject: [PATCH] NFS: pnfs_pageio_init_read() and init_write() need an extra argument

From: Bryan Schumaker <[email protected]>

This is only when CONFIG_NFS_V4_1 isn't enabled.

Signed-off-by: Bryan Schumaker <[email protected]>
---
fs/nfs/pnfs.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 8efbee7..f20054b 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -424,12 +424,14 @@ static inline void unset_pnfs_layoutdriver(struct nfs_server *s)
{
}

-static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode)
+static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode,
+ const struct nfs_pgio_completion_ops *compl_ops)
{
return false;
}

-static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags)
+static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags,
+ const struct nfs_pgio_completion_ops *compl_ops)
{
return false;
}
--
1.7.10

2012-04-30 17:29:01

by Fred Isaman

Subject: Re: [PATCH] NFS: pnfs_pageio_init_read() and init_write() need an extra argument

ACK

Fred

On Mon, Apr 30, 2012 at 1:06 PM, <[email protected]> wrote:
> From: Bryan Schumaker <[email protected]>
>
> This is only when CONFIG_NFS_V4_1 isn't enabled.
>
> Signed-off-by: Bryan Schumaker <[email protected]>
> ---
> ?fs/nfs/pnfs.h | ? ?6 ++++--
> ?1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
> index 8efbee7..f20054b 100644
> --- a/fs/nfs/pnfs.h
> +++ b/fs/nfs/pnfs.h
> @@ -424,12 +424,14 @@ static inline void unset_pnfs_layoutdriver(struct nfs_server *s)
> ?{
> ?}
>
> -static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode)
> +static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?const struct nfs_pgio_completion_ops *compl_ops)
> ?{
> ? ? ? ?return false;
> ?}
>
> -static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags)
> +static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? const struct nfs_pgio_completion_ops *compl_ops)
> ?{
> ? ? ? ?return false;
> ?}
> --
> 1.7.10
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html