dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

nfsd41: Backchannel: cleanup nfs4.0 callback encode routines

Browse source 
Mimic the client and prepare to share the back channel xdr with NFSv4.1.
Bump the number of operations in each encode routine, then backfill the
number of operations.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@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:
Andy Adamson 2009-06-16 04:20:50 +03:00 committed by J. Bruce Fields
parent 6ddbbbfe52
commit ef52bff840
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fs/nfsd/nfs4callback.c
View file

@ -140,8 +140,9 @@ struct nfs4_cb_compound_hdr {
int status; int status;
u32 ident; u32 ident;
u32 nops; u32 nops;
__be32 *nops_p;
u32 taglen; u32 taglen;
char * tag; char *tag;
}; };
static struct { static struct {
@ -201,7 +202,7 @@ nfs_cb_stat_to_errno(int stat)
* XDR encode * XDR encode
*/ */
static int static void
encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)
{ {
__be32 * p; __be32 * p;
@ -210,12 +211,18 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)
WRITE32(0); /* tag length is always 0 */ WRITE32(0); /* tag length is always 0 */
WRITE32(NFS4_MINOR_VERSION); WRITE32(NFS4_MINOR_VERSION);
WRITE32(hdr->ident); WRITE32(hdr->ident);
hdr->nops_p = p;
WRITE32(hdr->nops); WRITE32(hdr->nops);
return 0;
} }
static int static void encode_cb_nops(struct nfs4_cb_compound_hdr *hdr)
encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp) {
*hdr->nops_p = htonl(hdr->nops);
}
static void
encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,
struct nfs4_cb_compound_hdr *hdr)
{ {
__be32 *p; __be32 *p;
int len = dp->dl_fh.fh_size; int len = dp->dl_fh.fh_size;
@ -227,7 +234,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp)
WRITE32(0); /* truncate optimization not implemented */ WRITE32(0); /* truncate optimization not implemented */
WRITE32(len); WRITE32(len);
WRITEMEM(&dp->dl_fh.fh_base, len); WRITEMEM(&dp->dl_fh.fh_base, len);
return 0; hdr->nops++;
} }
static int static int
@ -246,12 +253,13 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation *
struct xdr_stream xdr; struct xdr_stream xdr;
struct nfs4_cb_compound_hdr hdr = { struct nfs4_cb_compound_hdr hdr = {
.ident = args->dl_ident, .ident = args->dl_ident,
.nops = 1,
}; };
xdr_init_encode(&xdr, &req->rq_snd_buf, p); xdr_init_encode(&xdr, &req->rq_snd_buf, p);
encode_cb_compound_hdr(&xdr, &hdr); encode_cb_compound_hdr(&xdr, &hdr);
return (encode_cb_recall(&xdr, args)); encode_cb_recall(&xdr, args, &hdr);
encode_cb_nops(&hdr);
return 0;
} }