| From 7c61f0d3897eeeff6f3294adb9f910ddefa8035a Mon Sep 17 00:00:00 2001 |
| From: Anna Schumaker <Anna.Schumaker@netapp.com> |
| Date: Tue, 14 Apr 2015 10:34:20 -0400 |
| Subject: NFS: Add a stub for GETDEVICELIST |
| |
| From: Anna Schumaker <Anna.Schumaker@netapp.com> |
| |
| commit 7c61f0d3897eeeff6f3294adb9f910ddefa8035a upstream. |
| |
| 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) |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/nfs4xdr.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/fs/nfs/nfs4xdr.c |
| +++ b/fs/nfs/nfs4xdr.c |
| @@ -7365,6 +7365,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), |
| @@ -7417,6 +7422,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), |
