NFS: Add a stub for GETDEVICELIST (7c61f0d3) · Commits · 戴 / test

(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 a stub to fix mountstats. Signed-off-by:

Anna Schumaker <Anna.Schumaker@Netapp.com> Fixes: (pnfs: remove GETDEVICELIST implementation) Cc: stable@vger.kernel.org # 3.17+ Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/nfs4xdr.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -7361,6 +7361,11 @@ nfs4_stat_to_errno(int stat)
		.p_name = #proc, \
		}

		#define STUB(proc) \
		[NFSPROC4_CLNT_##proc] = { \
		.p_name = #proc, \
		}

		struct rpc_procinfo nfs4_procedures[] = {
		PROC(READ, enc_read, dec_read),
		PROC(WRITE, enc_write, dec_write),
		@@ -7413,6 +7418,7 @@ 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),
		STUB(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),

Admin message