summaryrefslogtreecommitdiffstats
path: root/include/linux/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-04-29 19:09:19 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-05-01 17:31:44 -0400
commitc237dc0303bcf6f4cc2e0efe4fe4e341c6f34dac (patch)
treed314fbccd51967a80f31f62e2467f0936fd096c0 /include/linux/nfsd
parente300a63ce4ccec073d254d883a3638d5dca1d771 (diff)
downloadlinux-c237dc0303bcf6f4cc2e0efe4fe4e341c6f34dac.tar.gz
linux-c237dc0303bcf6f4cc2e0efe4fe4e341c6f34dac.tar.bz2
linux-c237dc0303bcf6f4cc2e0efe4fe4e341c6f34dac.zip
nfsd4: rename callback struct to cb_conn
I want to use the name for a struct that actually does represent a single callback. (Actually, I've never been sure it helps to a separate struct for the callback information. Some day maybe those fields could just be dumped into struct nfs4_client. I don't know.) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r--include/linux/nfsd/state.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 8d882a3eb4b9..563c367a3013 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -88,7 +88,7 @@ struct nfs4_delegation {
#define dl_fh dl_recall.cbr_fh
/* client delegation callback info */
-struct nfs4_callback {
+struct nfs4_cb_conn {
/* SETCLIENTID info */
u32 cb_addr;
unsigned short cb_port;
@@ -186,7 +186,7 @@ struct nfs4_client {
struct svc_cred cl_cred; /* setclientid principal */
clientid_t cl_clientid; /* generated by server */
nfs4_verifier cl_confirm; /* generated by server */
- struct nfs4_callback cl_callback; /* callback info */
+ struct nfs4_cb_conn cl_cb_conn; /* callback info */
atomic_t cl_count; /* ref count */
u32 cl_firststate; /* recovery dir creation */