[pnfs] [PATCH 08/23] 2.6-latest pnfs client don't call unimplemented operations

[andros at umich.edu]

From: Andy Adamson <andros at umich.edu>

Remove unimplemented pnfs operations from pnfs_v41_clientops so that
the nfslayoutdriver works. Will add opeations as implemented.

The 2.6.24 sessions patch included unimplemented stubs of pnfs functions.
This results in an nfslayoutdriver that compiles, but segfaults if run.
This patch keeps pnfs struct nfs_rpc_ops, but reverts the pnfs functions
to the non-pnfs nfs functions, which allows the nfslayoutdriver to run, albeit
not as a pnfs module. As pnfs functions get implemented, they can replace
the nfs counterpart, and the nfslayoutdriver can be incrementally tested as
functionality gets ported.

Signed off by: Andy Adamson<andros at umich.edu>
---
 fs/nfs/nfs4proc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0f92681..f78d4ef 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5212,7 +5212,7 @@ const struct nfs_rpc_ops pnfs_v41_clientops = {
 	.file_inode_ops	= &nfs4_file_inode_operations,
 	.getroot	= nfs4_proc_get_root,
 	.getattr	= nfs4_proc_getattr,
-	.setattr	= pnfs4_proc_setattr,
+	.setattr	= nfs4_proc_setattr,
 	.lookupfh	= nfs4_proc_lookupfh,
 	.lookup		= nfs4_proc_lookup,
 	.access		= nfs4_proc_access,
@@ -5234,10 +5234,10 @@ const struct nfs_rpc_ops pnfs_v41_clientops = {
 	.set_capabilities = nfs4_server_capabilities,
 	.decode_dirent	= nfs4_decode_dirent,
 	.read_setup	= nfs4_proc_read_setup,
-	.read_done	= pnfs4_read_done,
+	.read_done	= nfs4_read_done,
 	.write_setup	= nfs4_proc_write_setup,
-	.write_done	= pnfs4_write_done,
-	.commit_setup	= pnfs4_proc_commit_setup,
+	.write_done	= nfs4_write_done,
+	.commit_setup	= nfs4_proc_commit_setup,
 	.commit_done	= nfs4_commit_done,
 	.file_open      = nfs_open,
 	.file_release   = nfs_release,
-- 
1.5.0.2