diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2005-01-04 05:49:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:49:12 -0800 |
| commit | 82bd687c078f1be677fc2bf691c2729af0a4b33b (patch) | |
| tree | a4bd889ed3fb91912430ece65e27b862197d1741 /fs | |
| parent | 34e284b6d07883b3f7e8db0824a5a3bf768128b2 (diff) | |
| download | history-82bd687c078f1be677fc2bf691c2729af0a4b33b.tar.gz | |
[PATCH] knfsd: get rid of the special delegation_stateid_t, use the existing stateid_t.
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1396eb41c5a781..563367b437fbdf 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -790,8 +790,8 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open) 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_compoundres *resp, int nfserr, struct nfsd4_open 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_compoundres *resp, int nfserr, struct nfsd4_open 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); /* |