[pnfs] [PATCH 5/5] pnfs: update declaration of validate_args in filelayout

[andros at umich.edu]

From: Andy Adamson <andros at umich.edu>

The nfsv41 branch patch e0679290a02cb589c4ee26eec7dfd44102cecbac
adds returns from the validate_args implementations.

Move extern declarations to nfs4filelayout.h

Signed-off-by: Andy Adamson<andros at umich.edu>
---
 fs/nfs/nfs4filelayout.c |   16 ----------------
 fs/nfs/nfs4filelayout.h |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index d2a9e0c..7863ddf 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -62,22 +62,6 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Dean Hildebrand <dhildebz at eecs.umich.edu>");
 MODULE_DESCRIPTION("The NFSv4 file layout driver");
 
-extern void nfs_execute_read(struct nfs_read_data *data);
-extern void nfs_readdata_release(void *data);
-extern int nfs_flush_task_priority(int how);
-extern void nfs_writedata_release(void *data);
-extern void nfs_execute_write(struct nfs_write_data *data);
-extern void nfs_commit_rpcsetup(struct nfs_write_data *data, int sync);
-extern struct nfs_write_data *nfs_commit_alloc(void);
-extern void nfs_commit_free(struct nfs_write_data *p);
-extern void nfs_initiate_write(struct nfs_write_data *, struct rpc_clnt *, const struct rpc_call_ops *, int);
-extern void nfs_initiate_read(struct nfs_read_data *data, struct rpc_clnt *clnt, const struct rpc_call_ops *call_ops);
-extern void nfs_initiate_commit(struct nfs_write_data *, struct rpc_clnt *, int);
-extern void nfs_read_validate(struct rpc_task *task, void *calldata);
-extern void nfs_readdata_release(void *data);
-extern void nfs_write_validate(struct rpc_task *task, void *calldata);
-extern int nfs_flush_one(struct inode *, struct list_head *, unsigned int, size_t, int);
-
 /* Callback operations to the pNFS client */
 struct pnfs_client_operations *pnfs_callback_ops;
 
diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index 45212a2..5c567dd 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -127,4 +127,24 @@ nfs4_pnfs_device_item_get(struct inode *inode, u32 dev_id);
 	p += XDR_QUADLEN(nbytes);		\
 } while (0)
 
+extern void nfs_execute_read(struct nfs_read_data *);
+extern void nfs_readdata_release(void *);
+extern int nfs_flush_task_priority(int);
+extern void nfs_writedata_release(void *);
+extern void nfs_execute_write(struct nfs_write_data *);
+extern void nfs_commit_rpcsetup(struct nfs_write_data *, int);
+extern struct nfs_write_data *nfs_commit_alloc(void);
+extern void nfs_commit_free(struct nfs_write_data *);
+extern void nfs_initiate_write(struct nfs_write_data *, struct rpc_clnt *,
+			       const struct rpc_call_ops *, int);
+extern void nfs_initiate_read(struct nfs_read_data *, struct rpc_clnt *,
+			      const struct rpc_call_ops *);
+extern void nfs_initiate_commit(struct nfs_write_data *, struct rpc_clnt *,
+				int);
+extern int nfs_read_validate(struct rpc_task *, void *);
+extern void nfs_readdata_release(void *);
+extern int nfs_write_validate(struct rpc_task *, void *);
+extern int nfs_flush_one(struct inode *, struct list_head *, unsigned int,
+			 size_t, int);
+
 #endif /* FS_NFS_NFS4FILELAYOUT_H */
-- 
1.5.0.2