linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / nfs / nfs4xdr.c

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7c5d70e..4bbf5ef 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4344,8 +4344,6 @@ nfs_stat_to_errno(int stat)
        .p_encode = (kxdrproc_t) nfs4_xdr_##argtype,            \
        .p_decode = (kxdrproc_t) nfs4_xdr_##restype,            \
        .p_bufsiz = MAX(NFS4_##argtype##_sz,NFS4_##restype##_sz) << 2,  \
-       .p_statidx = NFSPROC4_CLNT_##proc,                      \
-       .p_name   = #proc,                                      \
     }
 
 struct rpc_procinfo    nfs4_procedures[] = {
@@ -4386,7 +4384,7 @@ struct rpc_procinfo       nfs4_procedures[] = {
 
 struct rpc_version             nfs_version4 = {
        .number                 = 4,
-       .nrprocs                = ARRAY_SIZE(nfs4_procedures),
+       .nrprocs                = sizeof(nfs4_procedures)/sizeof(nfs4_procedures[0]),
        .procs                  = nfs4_procedures
 };