nfsd4: remove separate cb_args struct

[net-next-2.6.git] / fs / nfsd / state.h

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 19732d531cdafcde794307079a583d8ac4f443ec..2ece6bee65f7a13b7a1eea26a14c9119aa8307d6 100644 (file)
--- 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;