summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorJ. Bruce Fields2010-10-20 01:36:51 +0200
committerJ. Bruce Fields2010-10-21 16:12:02 +0200
commit8323c3b2a6b6543919d5ebdddc7d52f192126161 (patch)
tree35976d6ba2f1917f569e44056c43f2bf724af7ef /fs/nfsd/state.h
parentnfsd4: delay session removal till free_client (diff)
downloadkernel-qcow2-linux-8323c3b2a6b6543919d5ebdddc7d52f192126161.tar.gz
kernel-qcow2-linux-8323c3b2a6b6543919d5ebdddc7d52f192126161.tar.xz
kernel-qcow2-linux-8323c3b2a6b6543919d5ebdddc7d52f192126161.zip
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.h2
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 {
size_t cb_addrlen;
u32 cb_prog; /* used only in 4.0 case;
per-session otherwise */
- u32 cb_minorversion;
u32 cb_ident; /* minorversion 0 only */
struct svc_xprt *cb_xprt; /* minorversion 1 only */
};
@@ -227,6 +226,7 @@ struct nfs4_client {
clientid_t cl_clientid; /* generated by server */
nfs4_verifier cl_confirm; /* generated by server */
u32 cl_firststate; /* recovery dir creation */
+ u32 cl_minorversion;
/* for v4.0 and v4.1 callbacks: */
struct nfs4_cb_conn cl_cb_conn;