From: Bryan Schumaker Date: Mon, 30 Apr 2012 17:06:53 +0000 (-0400) Subject: NFS: pnfs_pageio_init_read() and init_write() need an extra argument X-Git-Tag: v3.5-rc1~52^2~114 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b58fee2189b17719c846f65ffe9483c2814e6605;p=~emulex%2Finfiniband.git NFS: pnfs_pageio_init_read() and init_write() need an extra argument This is only when CONFIG_NFS_V4_1 isn't enabled. Signed-off-by: Bryan Schumaker Acked-by: Fred Isaman Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 8efbee769ba..f20054b592b 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; }