diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-26 17:40:53 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-01 19:29:43 -0400 |
| commit | 586f36735e1d38c32bbfbb2716461e7178724b15 (patch) | |
| tree | 7754079a37b0cc78f95bb32bbd682aa3f821ed2a /fs/nfsd/state.h | |
| parent | 07263f1efe7d5b96e6713471abfa087f41bb2b7c (diff) | |
| download | blackbird-obmc-linux-586f36735e1d38c32bbfbb2716461e7178724b15.tar.gz blackbird-obmc-linux-586f36735e1d38c32bbfbb2716461e7178724b15.zip | |
nfsd4: combine nfs4_rpc_args and nfsd4_cb_sequence
These two structs don't really need to be distinct as far as I can tell.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 322518c88e4b..59313f1d8e67 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -64,15 +64,10 @@ typedef struct { (s)->si_fileid, \ (s)->si_generation -struct nfsd4_cb_sequence { - /* args/res */ - u32 cbs_minorversion; - struct nfs4_client *cbs_clp; -}; - struct nfs4_rpc_args { - void *args_op; - struct nfsd4_cb_sequence args_seq; + void *args_op; + struct nfs4_client *args_clp; + u32 args_minorversion; }; struct nfsd4_callback { |
