nfsd: embed nfsd4_current_state in nfsd4_compoundres
Remove the allocation of struct nfsd4_compound_state. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:

committed by
J. Bruce Fields

parent
42d671c78f
commit
e354d571bb
@@ -45,9 +45,9 @@
|
||||
#define XDR_LEN(n) (((n) + 3) & ~3)
|
||||
|
||||
struct nfsd4_compound_state {
|
||||
struct svc_fh current_fh;
|
||||
struct svc_fh save_fh;
|
||||
struct nfs4_stateowner *replay_owner;
|
||||
struct svc_fh current_fh;
|
||||
struct svc_fh save_fh;
|
||||
struct nfs4_stateowner *replay_owner;
|
||||
};
|
||||
|
||||
struct nfsd4_change_info {
|
||||
@@ -416,7 +416,8 @@ struct nfsd4_compoundres {
|
||||
u32 taglen;
|
||||
char * tag;
|
||||
u32 opcnt;
|
||||
__be32 * tagp; /* where to encode tag and opcount */
|
||||
__be32 * tagp; /* tag, opcount encode location */
|
||||
struct nfsd4_compound_state cstate;
|
||||
};
|
||||
|
||||
#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs)
|
||||
|
Reference in New Issue
Block a user