Commit ad24ecfb authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Move NFSPROC4_CLNT_BIND_CONN_TO_SESSION to the end of the operations 



For backward compatibility with nfs-utils.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Weston Andros Adamson <dros@netapp.com>
parent 89a21736

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -7221,8 +7221,6 @@ struct rpc_procinfo nfs4_procedures[] = { 
	PROC(RELEASE_LOCKOWNER,	enc_release_lockowner,	dec_release_lockowner),

	PROC(SECINFO,		enc_secinfo,		dec_secinfo),

#if defined(CONFIG_NFS_V4_1)

	PROC(BIND_CONN_TO_SESSION,

			enc_bind_conn_to_session, dec_bind_conn_to_session),

	PROC(EXCHANGE_ID,	enc_exchange_id,	dec_exchange_id),

	PROC(CREATE_SESSION,	enc_create_session,	dec_create_session),

	PROC(DESTROY_SESSION,	enc_destroy_session,	dec_destroy_session),
@@ -7237,6 +7235,8 @@ struct rpc_procinfo nfs4_procedures[] = { 
	PROC(TEST_STATEID,	enc_test_stateid,	dec_test_stateid),

	PROC(FREE_STATEID,	enc_free_stateid,	dec_free_stateid),

	PROC(GETDEVICELIST,	enc_getdevicelist,	dec_getdevicelist),

	PROC(BIND_CONN_TO_SESSION,

			enc_bind_conn_to_session, dec_bind_conn_to_session),

#endif /* CONFIG_NFS_V4_1 */

};

include/linux/nfs4.h

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ enum { 
	NFSPROC4_CLNT_SECINFO,



	/* nfs41 */

	NFSPROC4_CLNT_BIND_CONN_TO_SESSION,

	NFSPROC4_CLNT_EXCHANGE_ID,

	NFSPROC4_CLNT_CREATE_SESSION,

	NFSPROC4_CLNT_DESTROY_SESSION,
@@ -608,6 +607,7 @@ enum { 
	NFSPROC4_CLNT_TEST_STATEID,

	NFSPROC4_CLNT_FREE_STATEID,

	NFSPROC4_CLNT_GETDEVICELIST,

	NFSPROC4_CLNT_BIND_CONN_TO_SESSION,

};



/* nfs41 types */