[1/3] pnfs-submit: wave2: remove forgotten layoutreturn struct definitions

Commit Message

Fred Isaman Dec. 14, 2010, 10:02 p.m. UTC

None

Patch

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 55511e8..8ca7700 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -557,7 +557,6 @@  enum {
 	NFSPROC4_CLNT_RECLAIM_COMPLETE,
 	NFSPROC4_CLNT_LAYOUTGET,
 	NFSPROC4_CLNT_LAYOUTCOMMIT,
-	NFSPROC4_CLNT_LAYOUTRETURN,
 	NFSPROC4_CLNT_GETDEVICEINFO,
 	NFSPROC4_CLNT_PNFS_WRITE,
 	NFSPROC4_CLNT_PNFS_COMMIT,
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a651574..9d847ac 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -258,29 +258,6 @@  struct nfs4_layoutcommit_data {
 	int status;
 };
 
-struct nfs4_layoutreturn_args {
-	__u32   reclaim;
-	__u32   layout_type;
-	__u32   return_type;
-	struct pnfs_layout_range range;
-	struct inode *inode;
-	struct nfs4_sequence_args seq_args;
-};
-
-struct nfs4_layoutreturn_res {
-	struct nfs4_sequence_res seq_res;
-	u32 lrs_present;
-	nfs4_stateid stateid;
-};
-
-struct nfs4_layoutreturn {
-	struct nfs4_layoutreturn_args args;
-	struct nfs4_layoutreturn_res res;
-	struct rpc_cred *cred;
-	struct nfs_client *clp;
-	int rpc_status;
-};
-
 struct nfs4_getdeviceinfo_args {
 	struct pnfs_device *pdev;
 	struct nfs4_sequence_args seq_args;