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

For backward compatibility with nfs-utils.

Trond Myklebust committed 14 years ago

Commit ad24ecf1 parent 89a21732 files · +3 −3Browse files

Unified · Split

2 files

fs/nfs/nfs4xdr.c +2 −2
include/linux/nfs4.h +1 −1

fs/nfs/nfs4xdr.c+2−2

@@ -7221,8 +7221,6 @@ struct rpc_procinfo nfs4_procedures[] = { · 7220 unmodified lines
7221	7221	PROC(RELEASE_LOCKOWNER, enc_release_lockowner, dec_release_lockowner),
7222	7222	PROC(SECINFO, enc_secinfo, dec_secinfo),
7223	7223	#if defined(CONFIG_NFS_V4_1)
7224		− PROC(BIND_CONN_TO_SESSION,
7225		− enc_bind_conn_to_session, dec_bind_conn_to_session),
7226	7224	PROC(EXCHANGE_ID, enc_exchange_id, dec_exchange_id),
7227	7225	PROC(CREATE_SESSION, enc_create_session, dec_create_session),
7228	7226	PROC(DESTROY_SESSION, enc_destroy_session, dec_destroy_session),
@@ -7237,6 +7235,8 @@ struct rpc_procinfo nfs4_procedures[] = { · 8 unmodified lines
7237	7235	PROC(TEST_STATEID, enc_test_stateid, dec_test_stateid),
7238	7236	PROC(FREE_STATEID, enc_free_stateid, dec_free_stateid),
7239	7237	PROC(GETDEVICELIST, enc_getdevicelist, dec_getdevicelist),
	7238	+ PROC(BIND_CONN_TO_SESSION,
	7239	+ enc_bind_conn_to_session, dec_bind_conn_to_session),
7240	7240	#endif /* CONFIG_NFS_V4_1 */
7241	7241	};
7242	7242

include/linux/nfs4.h+1−1

@@ -593,7 +593,6 @@ enum { · 592 unmodified lines
593	593	NFSPROC4_CLNT_SECINFO,
594	594
595	595	/* nfs41 */
596		− NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
597	596	NFSPROC4_CLNT_EXCHANGE_ID,
598	597	NFSPROC4_CLNT_CREATE_SESSION,
599	598	NFSPROC4_CLNT_DESTROY_SESSION,
@@ -608,6 +607,7 @@ enum { · 8 unmodified lines
608	607	NFSPROC4_CLNT_TEST_STATEID,
609	608	NFSPROC4_CLNT_FREE_STATEID,
610	609	NFSPROC4_CLNT_GETDEVICELIST,
	610	+ NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
611	611	};
612	612
613	613	/* nfs41 types */