| Message ID | 567BE110.3070406@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> There are 59 client rpc procedures, not 60. > > The order of rpc name must be the same as define of > NFSPROC4_CLNT_xx in include/linux/nfs4.h, > not nfs4_procedures in nfs4xdr.c. Thanks for fixing this -- I did not look very closely at the #define PROC(proc, argtype, restype) and missed the designated initializer. It looks like we don't keep track of stats for NULL, then. That seems like a minor problem -- but maybe we shouldn't be pretending we are keeping track of it. > Drop duplicate rpc name "getdevlist". > > Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Reviewed-by: Benjamin Coddington <bcodding@redhat.com> > --- > utils/nfsstat/nfsstat.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c > index b67f0aa..8376347 100644 > --- a/utils/nfsstat/nfsstat.c > +++ b/utils/nfsstat/nfsstat.c > @@ -31,7 +31,7 @@ enum { > SRVPROC3_SZ = 22, > CLTPROC3_SZ = 22, > SRVPROC4_SZ = 2, > - CLTPROC4_SZ = 60, > + CLTPROC4_SZ = 59, > SRVPROC4OPS_SZ = 71, > }; > > @@ -135,11 +135,10 @@ static const char * nfscltproc4name[CLTPROC4_SZ] = { > "sequence", > "get_lease_time", > "reclaim_comp", > - "getdevinfo", > "layoutget", > + "getdevinfo", > "layoutcommit", > "layoutreturn", > - "getdevlist", > "secinfo_no", > "test_stateid", > "free_stateid", > -- > 2.5.0 > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/24/2015 07:12 AM, Kinglong Mee wrote: > There are 59 client rpc procedures, not 60. > > The order of rpc name must be the same as define of > NFSPROC4_CLNT_xx in include/linux/nfs4.h, > not nfs4_procedures in nfs4xdr.c. > > Drop duplicate rpc name "getdevlist". > > Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Committed! Thanks! steved. > --- > utils/nfsstat/nfsstat.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c > index b67f0aa..8376347 100644 > --- a/utils/nfsstat/nfsstat.c > +++ b/utils/nfsstat/nfsstat.c > @@ -31,7 +31,7 @@ enum { > SRVPROC3_SZ = 22, > CLTPROC3_SZ = 22, > SRVPROC4_SZ = 2, > - CLTPROC4_SZ = 60, > + CLTPROC4_SZ = 59, > SRVPROC4OPS_SZ = 71, > }; > > @@ -135,11 +135,10 @@ static const char * nfscltproc4name[CLTPROC4_SZ] = { > "sequence", > "get_lease_time", > "reclaim_comp", > - "getdevinfo", > "layoutget", > + "getdevinfo", > "layoutcommit", > "layoutreturn", > - "getdevlist", > "secinfo_no", > "test_stateid", > "free_stateid", > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index b67f0aa..8376347 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -31,7 +31,7 @@ enum { SRVPROC3_SZ = 22, CLTPROC3_SZ = 22, SRVPROC4_SZ = 2, - CLTPROC4_SZ = 60, + CLTPROC4_SZ = 59, SRVPROC4OPS_SZ = 71, }; @@ -135,11 +135,10 @@ static const char * nfscltproc4name[CLTPROC4_SZ] = { "sequence", "get_lease_time", "reclaim_comp", - "getdevinfo", "layoutget", + "getdevinfo", "layoutcommit", "layoutreturn", - "getdevlist", "secinfo_no", "test_stateid", "free_stateid",
There are 59 client rpc procedures, not 60. The order of rpc name must be the same as define of NFSPROC4_CLNT_xx in include/linux/nfs4.h, not nfs4_procedures in nfs4xdr.c. Drop duplicate rpc name "getdevlist". Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> --- utils/nfsstat/nfsstat.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)