Skip to content

L
linux
Commit 4ade9821 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Add a helper for encoding NFSv4 sequence ids 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6fdfb0bc
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 19 deletions
fs/nfs/nfs4xdr.c
View file @ 4ade9821
...@@ -901,6 +901,20 @@ static void encode_string(struct xdr_stream *xdr, unsigned int len, const char * ...@@ -901,6 +901,20 @@ static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *
xdr_encode_opaque(p, str, len); xdr_encode_opaque(p, str, len);
} }
static void encode_uint32(struct xdr_stream *xdr, u32 n)
{
__be32 *p;
p = reserve_space(xdr, 4);
*p = cpu_to_be32(n);
}
static void encode_nfs4_seqid(struct xdr_stream *xdr,
const struct nfs_seqid *seqid)
{
encode_uint32(xdr, seqid->sequence->counter);
}
static void encode_compound_hdr(struct xdr_stream *xdr, static void encode_compound_hdr(struct xdr_stream *xdr,
struct rpc_rqst *req, struct rpc_rqst *req,
struct compound_hdr *hdr) struct compound_hdr *hdr)
...@@ -1074,9 +1088,9 @@ static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg ...@@ -1074,9 +1088,9 @@ static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg
{ {
__be32 *p; __be32 *p;
p = reserve_space(xdr, 8); p = reserve_space(xdr, 4);
*p++ = cpu_to_be32(OP_CLOSE); *p = cpu_to_be32(OP_CLOSE);
*p = cpu_to_be32(arg->seqid->sequence->counter); encode_nfs4_seqid(xdr, arg->seqid);
encode_nfs4_stateid(xdr, arg->stateid); encode_nfs4_stateid(xdr, arg->stateid);
hdr->nops++; hdr->nops++;
hdr->replen += decode_close_maxsz; hdr->replen += decode_close_maxsz;
...@@ -1264,17 +1278,14 @@ static void encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args ...@@ -1264,17 +1278,14 @@ static void encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args
p = xdr_encode_hyper(p, nfs4_lock_length(args->fl)); p = xdr_encode_hyper(p, nfs4_lock_length(args->fl));
*p = cpu_to_be32(args->new_lock_owner); *p = cpu_to_be32(args->new_lock_owner);
if (args->new_lock_owner){ if (args->new_lock_owner){
p = reserve_space(xdr, 4); encode_nfs4_seqid(xdr, args->open_seqid);
*p = cpu_to_be32(args->open_seqid->sequence->counter);
encode_nfs4_stateid(xdr, args->open_stateid); encode_nfs4_stateid(xdr, args->open_stateid);
p = reserve_space(xdr, 4); encode_nfs4_seqid(xdr, args->lock_seqid);
*p = cpu_to_be32(args->lock_seqid->sequence->counter);
encode_lockowner(xdr, &args->lock_owner); encode_lockowner(xdr, &args->lock_owner);
} }
else { else {
encode_nfs4_stateid(xdr, args->lock_stateid); encode_nfs4_stateid(xdr, args->lock_stateid);
p = reserve_space(xdr, 4); encode_nfs4_seqid(xdr, args->lock_seqid);
*p = cpu_to_be32(args->lock_seqid->sequence->counter);
} }
hdr->nops++; hdr->nops++;
hdr->replen += decode_lock_maxsz; hdr->replen += decode_lock_maxsz;
...@@ -1298,10 +1309,10 @@ static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *ar ...@@ -1298,10 +1309,10 @@ static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *ar
{ {
__be32 *p; __be32 *p;
p = reserve_space(xdr, 12); p = reserve_space(xdr, 8);
*p++ = cpu_to_be32(OP_LOCKU); *p++ = cpu_to_be32(OP_LOCKU);
*p++ = cpu_to_be32(nfs4_lock_type(args->fl, 0)); *p = cpu_to_be32(nfs4_lock_type(args->fl, 0));
*p = cpu_to_be32(args->seqid->sequence->counter); encode_nfs4_seqid(xdr, args->seqid);
encode_nfs4_stateid(xdr, args->stateid); encode_nfs4_stateid(xdr, args->stateid);
p = reserve_space(xdr, 16); p = reserve_space(xdr, 16);
p = xdr_encode_hyper(p, args->fl->fl_start); p = xdr_encode_hyper(p, args->fl->fl_start);
...@@ -1360,9 +1371,9 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena ...@@ -1360,9 +1371,9 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena
* opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4, * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4,
* owner 4 = 32 * owner 4 = 32
*/ */
p = reserve_space(xdr, 8); p = reserve_space(xdr, 4);
*p++ = cpu_to_be32(OP_OPEN); *p = cpu_to_be32(OP_OPEN);
*p = cpu_to_be32(arg->seqid->sequence->counter); encode_nfs4_seqid(xdr, arg->seqid);
encode_share_access(xdr, arg->fmode); encode_share_access(xdr, arg->fmode);
p = reserve_space(xdr, 32); p = reserve_space(xdr, 32);
p = xdr_encode_hyper(p, arg->clientid); p = xdr_encode_hyper(p, arg->clientid);
...@@ -1496,8 +1507,7 @@ static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_co ...@@ -1496,8 +1507,7 @@ static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_co
p = reserve_space(xdr, 4); p = reserve_space(xdr, 4);
*p = cpu_to_be32(OP_OPEN_CONFIRM); *p = cpu_to_be32(OP_OPEN_CONFIRM);
encode_nfs4_stateid(xdr, arg->stateid); encode_nfs4_stateid(xdr, arg->stateid);
p = reserve_space(xdr, 4); encode_nfs4_seqid(xdr, arg->seqid);
*p = cpu_to_be32(arg->seqid->sequence->counter);
hdr->nops++; hdr->nops++;
hdr->replen += decode_open_confirm_maxsz; hdr->replen += decode_open_confirm_maxsz;
} }
...@@ -1509,8 +1519,7 @@ static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_close ...@@ -1509,8 +1519,7 @@ static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_close
p = reserve_space(xdr, 4); p = reserve_space(xdr, 4);
*p = cpu_to_be32(OP_OPEN_DOWNGRADE); *p = cpu_to_be32(OP_OPEN_DOWNGRADE);
encode_nfs4_stateid(xdr, arg->stateid); encode_nfs4_stateid(xdr, arg->stateid);
p = reserve_space(xdr, 4); encode_nfs4_seqid(xdr, arg->seqid);
*p = cpu_to_be32(arg->seqid->sequence->counter);
encode_share_access(xdr, arg->fmode); encode_share_access(xdr, arg->fmode);
hdr->nops++; hdr->nops++;
hdr->replen += decode_open_downgrade_maxsz; hdr->replen += decode_open_downgrade_maxsz;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7