aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-05-31 18:21:37 -0400
committerJ. Bruce Fields <bfields@redhat.com>2010-10-01 19:29:43 -0400
commitfb003923263c3f0cb02adbd56a22fe16ef5c0e77 (patch)
tree99eefb1d045250e1b871b92660d0e0f084aa67d3 /fs/nfsd/state.h
parentcee277d92495a9ea49a6137fe7005d7c76b31b5b (diff)
downloadkernel_samsung_smdk4412-fb003923263c3f0cb02adbd56a22fe16ef5c0e77.tar.gz
kernel_samsung_smdk4412-fb003923263c3f0cb02adbd56a22fe16ef5c0e77.tar.bz2
kernel_samsung_smdk4412-fb003923263c3f0cb02adbd56a22fe16ef5c0e77.zip
nfsd4: remove separate cb_args struct
I don't see the point of the separate struct. It seems to just be getting in the way. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r--fs/nfsd/state.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 19732d531cd..2ece6bee65f 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -64,14 +64,10 @@ typedef struct {
(s)->si_fileid, \
(s)->si_generation
-struct nfsd4_cb_args {
- void *args_op;
- struct nfs4_client *args_clp;
- u32 args_minorversion;
-};
-
struct nfsd4_callback {
- struct nfsd4_cb_args cb_args;
+ void *cb_op;
+ struct nfs4_client *cb_clp;
+ u32 cb_minorversion;
struct rpc_message cb_msg;
const struct rpc_call_ops *cb_ops;
struct work_struct cb_work;