diff options
author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2015-04-14 10:34:20 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-04-23 15:16:13 -0400 |
commit | 7c61f0d3897eeeff6f3294adb9f910ddefa8035a (patch) | |
tree | 29972826fad8e82b056461de70251dcd4d99dd1f | |
parent | 05f54903d9d370a4cd302a85681304d3ec59e5c1 (diff) |
NFS: Add a stub 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 a
stub to fix mountstats.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Fixes: d4b18c3e (pnfs: remove GETDEVICELIST implementation)
Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/nfs4xdr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 6b28a605c697..a26880cb8ce8 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -7361,6 +7361,11 @@ nfs4_stat_to_errno(int stat) | |||
7361 | .p_name = #proc, \ | 7361 | .p_name = #proc, \ |
7362 | } | 7362 | } |
7363 | 7363 | ||
7364 | #define STUB(proc) \ | ||
7365 | [NFSPROC4_CLNT_##proc] = { \ | ||
7366 | .p_name = #proc, \ | ||
7367 | } | ||
7368 | |||
7364 | struct rpc_procinfo nfs4_procedures[] = { | 7369 | struct rpc_procinfo nfs4_procedures[] = { |
7365 | PROC(READ, enc_read, dec_read), | 7370 | PROC(READ, enc_read, dec_read), |
7366 | PROC(WRITE, enc_write, dec_write), | 7371 | PROC(WRITE, enc_write, dec_write), |
@@ -7413,6 +7418,7 @@ struct rpc_procinfo nfs4_procedures[] = { | |||
7413 | PROC(SECINFO_NO_NAME, enc_secinfo_no_name, dec_secinfo_no_name), | 7418 | PROC(SECINFO_NO_NAME, enc_secinfo_no_name, dec_secinfo_no_name), |
7414 | PROC(TEST_STATEID, enc_test_stateid, dec_test_stateid), | 7419 | PROC(TEST_STATEID, enc_test_stateid, dec_test_stateid), |
7415 | PROC(FREE_STATEID, enc_free_stateid, dec_free_stateid), | 7420 | PROC(FREE_STATEID, enc_free_stateid, dec_free_stateid), |
7421 | STUB(GETDEVICELIST), | ||
7416 | PROC(BIND_CONN_TO_SESSION, | 7422 | PROC(BIND_CONN_TO_SESSION, |
7417 | enc_bind_conn_to_session, dec_bind_conn_to_session), | 7423 | enc_bind_conn_to_session, dec_bind_conn_to_session), |
7418 | PROC(DESTROY_CLIENTID, enc_destroy_clientid, dec_destroy_clientid), | 7424 | PROC(DESTROY_CLIENTID, enc_destroy_clientid, dec_destroy_clientid), |