From: NeilBrown Signed-off-by: Andy Adamson Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- 25-akpm/fs/nfsd/nfs4xdr.c | 12 ++++++------ 25-akpm/include/linux/nfsd/xdr4.h | 16 +++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff -puN fs/nfsd/nfs4xdr.c~knfsd-get-rid-of-the-special-delegation_stateid_t-use-the-existing-stateid_t fs/nfsd/nfs4xdr.c --- 25/fs/nfsd/nfs4xdr.c~knfsd-get-rid-of-the-special-delegation_stateid_t-use-the-existing-stateid_t Fri Dec 17 15:08:32 2004 +++ 25-akpm/fs/nfsd/nfs4xdr.c Fri Dec 17 15:08:32 2004 @@ -790,8 +790,8 @@ nfsd4_decode_open(struct nfsd4_compounda READ32(open->op_delegate_type); break; case NFS4_OPEN_CLAIM_DELEGATE_CUR: - READ_BUF(sizeof(delegation_stateid_t) + 4); - COPYMEM(&open->op_delegate_stateid, sizeof(delegation_stateid_t)); + READ_BUF(sizeof(stateid_t) + 4); + COPYMEM(&open->op_delegate_stateid, sizeof(stateid_t)); READ32(open->op_fname.len); READ_BUF(open->op_fname.len); SAVEMEM(open->op_fname.data, open->op_fname.len); @@ -2072,8 +2072,8 @@ nfsd4_encode_open(struct nfsd4_compoundr case NFS4_OPEN_DELEGATE_NONE: break; case NFS4_OPEN_DELEGATE_READ: - RESERVE_SPACE(20 + sizeof(delegation_stateid_t)); - WRITEMEM(&open->op_delegate_stateid, sizeof(delegation_stateid_t)); + RESERVE_SPACE(20 + sizeof(stateid_t)); + WRITEMEM(&open->op_delegate_stateid, sizeof(stateid_t)); WRITE32(0); /* @@ -2086,8 +2086,8 @@ nfsd4_encode_open(struct nfsd4_compoundr ADJUST_ARGS(); break; case NFS4_OPEN_DELEGATE_WRITE: - RESERVE_SPACE(32 + sizeof(delegation_stateid_t)); - WRITEMEM(&open->op_delegate_stateid, sizeof(delegation_stateid_t)); + RESERVE_SPACE(32 + sizeof(stateid_t)); + WRITEMEM(&open->op_delegate_stateid, sizeof(stateid_t)); WRITE32(0); /* diff -puN include/linux/nfsd/xdr4.h~knfsd-get-rid-of-the-special-delegation_stateid_t-use-the-existing-stateid_t include/linux/nfsd/xdr4.h --- 25/include/linux/nfsd/xdr4.h~knfsd-get-rid-of-the-special-delegation_stateid_t-use-the-existing-stateid_t Fri Dec 17 15:08:32 2004 +++ 25-akpm/include/linux/nfsd/xdr4.h Fri Dec 17 15:08:32 2004 @@ -44,16 +44,6 @@ #define NFSD4_MAX_TAGLEN 128 #define XDR_LEN(n) (((n) + 3) & ~3) -typedef u32 delegation_zero_t; -typedef u32 delegation_boot_t; -typedef u64 delegation_id_t; - -typedef struct { - delegation_zero_t ds_zero; - delegation_boot_t ds_boot; - delegation_id_t ds_id; -} delegation_stateid_t; - struct nfsd4_change_info { u32 atomic; u32 before_ctime_sec; @@ -202,13 +192,13 @@ struct nfsd4_open { u32 op_claim_type; /* request */ struct xdr_netobj op_fname; /* request - everything but CLAIM_PREV */ u32 op_delegate_type; /* request - CLAIM_PREV only */ - delegation_stateid_t op_delegate_stateid; /* request - CLAIM_DELEGATE_CUR only */ + stateid_t op_delegate_stateid; /* request - response */ u32 op_create; /* request */ u32 op_createmode; /* request */ u32 op_bmval[2]; /* request */ union { /* request */ - struct iattr iattr; /* UNCHECKED4,GUARDED4 */ - nfs4_verifier verf; /* EXCLUSIVE4 */ + struct iattr iattr; /* UNCHECKED4,GUARDED4 */ + nfs4_verifier verf; /* EXCLUSIVE4 */ } u; clientid_t op_clientid; /* request */ struct xdr_netobj op_owner; /* request */ _