NFS: update hdr->replen for every encode op
Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
0c4e8c1877
commit
dadf0c2767
1 changed files with 31 additions and 0 deletions
|
@ -749,6 +749,7 @@ static void encode_access(struct xdr_stream *xdr, u32 access, struct compound_hd
|
|||
WRITE32(OP_ACCESS);
|
||||
WRITE32(access);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_access_maxsz;
|
||||
}
|
||||
|
||||
static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg, struct compound_hdr *hdr)
|
||||
|
@ -760,6 +761,7 @@ static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg
|
|||
WRITE32(arg->seqid->sequence->counter);
|
||||
WRITEMEM(arg->stateid->data, NFS4_STATEID_SIZE);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_close_maxsz;
|
||||
}
|
||||
|
||||
static void encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr)
|
||||
|
@ -771,6 +773,7 @@ static void encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *ar
|
|||
WRITE64(args->offset);
|
||||
WRITE32(args->count);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_commit_maxsz;
|
||||
}
|
||||
|
||||
static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create, struct compound_hdr *hdr)
|
||||
|
@ -802,6 +805,7 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *
|
|||
WRITE32(create->name->len);
|
||||
WRITEMEM(create->name->name, create->name->len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_create_maxsz;
|
||||
|
||||
encode_attrs(xdr, create->attrs, create->server);
|
||||
}
|
||||
|
@ -815,6 +819,7 @@ static void encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap, struct c
|
|||
WRITE32(1);
|
||||
WRITE32(bitmap);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_getattr_maxsz;
|
||||
}
|
||||
|
||||
static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1, struct compound_hdr *hdr)
|
||||
|
@ -827,6 +832,7 @@ static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm
|
|||
WRITE32(bm0);
|
||||
WRITE32(bm1);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_getattr_maxsz;
|
||||
}
|
||||
|
||||
static void encode_getfattr(struct xdr_stream *xdr, const u32* bitmask, struct compound_hdr *hdr)
|
||||
|
@ -854,6 +860,7 @@ static void encode_getfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(OP_GETFH);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_getfh_maxsz;
|
||||
}
|
||||
|
||||
static void encode_link(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
|
||||
|
@ -865,6 +872,7 @@ static void encode_link(struct xdr_stream *xdr, const struct qstr *name, struct
|
|||
WRITE32(name->len);
|
||||
WRITEMEM(name->name, name->len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_link_maxsz;
|
||||
}
|
||||
|
||||
static inline int nfs4_lock_type(struct file_lock *fl, int block)
|
||||
|
@ -912,6 +920,7 @@ static void encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args
|
|||
WRITE32(args->lock_seqid->sequence->counter);
|
||||
}
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_lock_maxsz;
|
||||
}
|
||||
|
||||
static void encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args, struct compound_hdr *hdr)
|
||||
|
@ -928,6 +937,7 @@ static void encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *ar
|
|||
WRITEMEM("lock id:", 8);
|
||||
WRITE64(args->lock_owner.id);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_lockt_maxsz;
|
||||
}
|
||||
|
||||
static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args, struct compound_hdr *hdr)
|
||||
|
@ -942,6 +952,7 @@ static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *ar
|
|||
WRITE64(args->fl->fl_start);
|
||||
WRITE64(nfs4_lock_length(args->fl));
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_locku_maxsz;
|
||||
}
|
||||
|
||||
static void encode_lookup(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
|
||||
|
@ -954,6 +965,7 @@ static void encode_lookup(struct xdr_stream *xdr, const struct qstr *name, struc
|
|||
WRITE32(len);
|
||||
WRITEMEM(name->name, len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_lookup_maxsz;
|
||||
}
|
||||
|
||||
static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode)
|
||||
|
@ -1093,6 +1105,7 @@ static void encode_open(struct xdr_stream *xdr, const struct nfs_openargs *arg,
|
|||
BUG();
|
||||
}
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_open_maxsz;
|
||||
}
|
||||
|
||||
static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg, struct compound_hdr *hdr)
|
||||
|
@ -1104,6 +1117,7 @@ static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_co
|
|||
WRITEMEM(arg->stateid->data, NFS4_STATEID_SIZE);
|
||||
WRITE32(arg->seqid->sequence->counter);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_open_confirm_maxsz;
|
||||
}
|
||||
|
||||
static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg, struct compound_hdr *hdr)
|
||||
|
@ -1116,6 +1130,7 @@ static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_close
|
|||
WRITE32(arg->seqid->sequence->counter);
|
||||
encode_share_access(xdr, arg->fmode);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_open_downgrade_maxsz;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1129,6 +1144,7 @@ encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh, struct compound_hd
|
|||
WRITE32(len);
|
||||
WRITEMEM(fh->data, len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_putfh_maxsz;
|
||||
}
|
||||
|
||||
static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
|
||||
|
@ -1138,6 +1154,7 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(OP_PUTROOTFH);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_putrootfh_maxsz;
|
||||
}
|
||||
|
||||
static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx)
|
||||
|
@ -1166,6 +1183,7 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args,
|
|||
WRITE64(args->offset);
|
||||
WRITE32(args->count);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_read_maxsz;
|
||||
}
|
||||
|
||||
static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req, struct compound_hdr *hdr)
|
||||
|
@ -1191,6 +1209,7 @@ static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
|
|||
WRITE32(attrs[0] & readdir->bitmask[0]);
|
||||
WRITE32(attrs[1] & readdir->bitmask[1]);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_readdir_maxsz;
|
||||
dprintk("%s: cookie = %Lu, verifier = %08x:%08x, bitmap = %08x:%08x\n",
|
||||
__func__,
|
||||
(unsigned long long)readdir->cookie,
|
||||
|
@ -1207,6 +1226,7 @@ static void encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(OP_READLINK);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_readlink_maxsz;
|
||||
}
|
||||
|
||||
static void encode_remove(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
|
||||
|
@ -1218,6 +1238,7 @@ static void encode_remove(struct xdr_stream *xdr, const struct qstr *name, struc
|
|||
WRITE32(name->len);
|
||||
WRITEMEM(name->name, name->len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_remove_maxsz;
|
||||
}
|
||||
|
||||
static void encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname, struct compound_hdr *hdr)
|
||||
|
@ -1233,6 +1254,7 @@ static void encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, co
|
|||
WRITE32(newname->len);
|
||||
WRITEMEM(newname->name, newname->len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_rename_maxsz;
|
||||
}
|
||||
|
||||
static void encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid, struct compound_hdr *hdr)
|
||||
|
@ -1243,6 +1265,7 @@ static void encode_renew(struct xdr_stream *xdr, const struct nfs_client *client
|
|||
WRITE32(OP_RENEW);
|
||||
WRITE64(client_stateid->cl_clientid);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_renew_maxsz;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1253,6 +1276,7 @@ encode_restorefh(struct xdr_stream *xdr, struct compound_hdr *hdr)
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(OP_RESTOREFH);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_restorefh_maxsz;
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -1272,6 +1296,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun
|
|||
WRITE32(arg->acl_len);
|
||||
xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_setacl_maxsz;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1283,6 +1308,7 @@ encode_savefh(struct xdr_stream *xdr, struct compound_hdr *hdr)
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(OP_SAVEFH);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_savefh_maxsz;
|
||||
}
|
||||
|
||||
static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server, struct compound_hdr *hdr)
|
||||
|
@ -1293,6 +1319,7 @@ static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs
|
|||
WRITE32(OP_SETATTR);
|
||||
WRITEMEM(arg->stateid.data, NFS4_STATEID_SIZE);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_setattr_maxsz;
|
||||
encode_attrs(xdr, arg->iap, server);
|
||||
}
|
||||
|
||||
|
@ -1312,6 +1339,7 @@ static void encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclie
|
|||
RESERVE_SPACE(4);
|
||||
WRITE32(setclientid->sc_cb_ident);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_setclientid_maxsz;
|
||||
}
|
||||
|
||||
static void encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state, struct compound_hdr *hdr)
|
||||
|
@ -1323,6 +1351,7 @@ static void encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_
|
|||
WRITE64(client_state->cl_clientid);
|
||||
WRITEMEM(client_state->cl_confirm.data, NFS4_VERIFIER_SIZE);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_setclientid_confirm_maxsz;
|
||||
}
|
||||
|
||||
static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr)
|
||||
|
@ -1341,6 +1370,7 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg
|
|||
|
||||
xdr_write_pages(xdr, args->pages, args->pgbase, args->count);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_write_maxsz;
|
||||
}
|
||||
|
||||
static void encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid, struct compound_hdr *hdr)
|
||||
|
@ -1352,6 +1382,7 @@ static void encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *state
|
|||
WRITE32(OP_DELEGRETURN);
|
||||
WRITEMEM(stateid->data, NFS4_STATEID_SIZE);
|
||||
hdr->nops++;
|
||||
hdr->replen += decode_delegreturn_maxsz;
|
||||
}
|
||||
/*
|
||||
* END OF "GENERIC" ENCODE ROUTINES.
|
||||
|
|
Reference in a new issue