NFS: Add stubs for GETDEVICELIST
Subsystems (2)
PATCH v2 1/1 NFS: Add stubs for GETDEVICELIST
d4b18c3e (pnfs: remove GETDEVICELIST implementation) removed the GETDEVICELIST operation from the NFS client, but left a "hole" in the nfs4_procedures array. This caused /proc/self/mountstats to report an operation named "51" where GETDEVICELIST used to be. This patch adds back stubs to fix mountstats.
--- fs/nfs/nfs4xdr.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
fs/nfs/nfs4xdr.c +24 -2
@@ -860,6 +860,8 @@ static int nfs4_stat_to_errno(int);#define NFS4_dec_free_stateid_sz (compound_decode_hdr_maxsz + \ decode_sequence_maxsz + \ decode_free_stateid_maxsz) +#define NFS4_enc_getdevicelist_sz (0) +#define NFS4_dec_getdevicelist_sz (0) const u32 nfs41_maxwrite_overhead = ((RPC_MAX_HEADER_WITH_AUTH + compound_encode_hdr_maxsz +
@@ -2997,6 +2999,16 @@ static void nfs4_xdr_enc_free_stateid(struct rpc_rqst *req,encode_free_stateid (xdr, args, &hdr); encode_nops(&hdr); } + +/* +* Encode GEDEVICELIST request +*/ +static void nfs4_xdr_enc_getdevicelist (struct rpc_rqst *req, +struct xdr_stream *xdr, +void *args) +{ +} +#endif /* CONFIG_NFS_V4_1 */ static void print_overflow_msg (const char *func,const struct xdr_stream *xdr)
@@ -7202,6 +7214,16 @@ static int nfs4_xdr_dec_free_stateid(struct rpc_rqst *rqstp, out: return status; } + +/* +* Decide GETDEVICELIST response +*/ +static int nfs4_xdr_dec_getdevicelist (struct rpc_rqst *rqstp, +struct xdr_stream *xdr, +void *res) +{ +return 0 ; +}#endif /* CONFIG_NFS_V4_1 */ /**
@@ -7413,8 +7435,8 @@ struct rpc_procinfo nfs4_procedures[] = {PROC (SECINFO_NO_NAME , enc_secinfo_no_name, dec_secinfo_no_name),PROC (TEST_STATEID , enc_test_stateid, dec_test_stateid),PROC (FREE_STATEID , enc_free_stateid, dec_free_stateid), -PROC (BIND_CONN_TO_SESSION , - enc_bind_conn_to_session, dec_bind_conn_to_session), +PROC (GETDEVICELIST , enc_getdevicelist, dec_getdevicelist), +PROC (BIND_CONN_TO_SESSION , enc_bind_conn_to_session, dec_bind_conn_to_session),PROC (DESTROY_CLIENTID , enc_destroy_clientid, dec_destroy_clientid), #endif /* CONFIG_NFS_V4_1 */ #ifdef CONFIG_NFS_V4_2
Signature · 1 line
2.3.5
Quoted 5 lines · Anna Schumaker
d4b18c3e(pnfs: remove GETDEVICELIST implementation) removed the GETDEVICELIST operation from the NFS client, but left a "hole" in thenfs4_proceduresarray. This caused/proc/self/mountstatsto report an operation named "51" where GETDEVICELIST used to be. This patch adds back stubs to fix mountstats.
The only thing we need here is the name, right? Why not add a STUB macro that just fills out the name field?
Quoted 9 lines · Christoph Hellwig
Quoted 5 lines · Anna Schumaker
d4b18c3e(pnfs: remove GETDEVICELIST implementation) removed the GETDEVICELIST operation from the NFS client, but left a "hole" in thenfs4_proceduresarray. This caused/proc/self/mountstatsto report an operation named "51" where GETDEVICELIST used to be. This patch adds back stubs to fix mountstats.The only thing we need here is the name, right? Why not add a STUB macro that just fills out the name field?
Good idea. I just sent a patch to do just that!
Anna