diff options
author | J. Bruce Fields <bfields@redhat.com> | 2010-10-19 19:36:51 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-21 10:12:02 -0400 |
commit | 8323c3b2a6b6543919d5ebdddc7d52f192126161 (patch) | |
tree | 35976d6ba2f1917f569e44056c43f2bf724af7ef /fs/nfsd/state.h | |
parent | 792c95dd519c54d6b0fd6401b3da7ea67b0d6b72 (diff) |
nfsd4: move minorversion to client
The minorversion seems more a property of the client than the callback
channel.
Some time we should probably also enforce consistent minorversion usage
from the client; for now, this is just a cosmetic change.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r-- | fs/nfsd/state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index bbc4d587b341..39adc27b0685 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h | |||
@@ -98,7 +98,6 @@ struct nfs4_cb_conn { | |||
98 | size_t cb_addrlen; | 98 | size_t cb_addrlen; |
99 | u32 cb_prog; /* used only in 4.0 case; | 99 | u32 cb_prog; /* used only in 4.0 case; |
100 | per-session otherwise */ | 100 | per-session otherwise */ |
101 | u32 cb_minorversion; | ||
102 | u32 cb_ident; /* minorversion 0 only */ | 101 | u32 cb_ident; /* minorversion 0 only */ |
103 | struct svc_xprt *cb_xprt; /* minorversion 1 only */ | 102 | struct svc_xprt *cb_xprt; /* minorversion 1 only */ |
104 | }; | 103 | }; |
@@ -227,6 +226,7 @@ struct nfs4_client { | |||
227 | clientid_t cl_clientid; /* generated by server */ | 226 | clientid_t cl_clientid; /* generated by server */ |
228 | nfs4_verifier cl_confirm; /* generated by server */ | 227 | nfs4_verifier cl_confirm; /* generated by server */ |
229 | u32 cl_firststate; /* recovery dir creation */ | 228 | u32 cl_firststate; /* recovery dir creation */ |
229 | u32 cl_minorversion; | ||
230 | 230 | ||
231 | /* for v4.0 and v4.1 callbacks: */ | 231 | /* for v4.0 and v4.1 callbacks: */ |
232 | struct nfs4_cb_conn cl_cb_conn; | 232 | struct nfs4_cb_conn cl_cb_conn; |