Skip to content

Commit

Permalink
nfs41: encode minorversion in compound header
Browse files Browse the repository at this point in the history 
Signed-off-by: Andy Adamdon <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfs41: pass *session in seq_args and seq_res]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Benny Halevy committed Jun 17, 2009
1 parent 28f5669 commit 66cc042
Showing 1 changed file with 40 additions and 30 deletions.
70 changes: 40 additions & 30 deletions fs/nfs/nfs4xdr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ struct compound_hdr {
uint32_t taglen;
char * tag;
uint32_t replen; /* expected reply words */
u32 minorversion;
};

/*
Expand Down Expand Up @@ -598,7 +599,7 @@ static void encode_compound_hdr(struct xdr_stream *xdr,
RESERVE_SPACE(12+(XDR_QUADLEN(hdr->taglen)<<2));
WRITE32(hdr->taglen);
WRITEMEM(hdr->tag, hdr->taglen);
WRITE32(NFS4_MINOR_VERSION);
WRITE32(hdr->minorversion);
hdr->nops_p = p;
WRITE32(hdr->nops);
}
Expand Down Expand Up @@ -1388,14 +1389,23 @@ static void encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *state
* END OF "GENERIC" ENCODE ROUTINES.
*/

static u32 nfs4_xdr_minorversion(const struct nfs4_sequence_args *args)
{
#if defined(CONFIG_NFS_V4_1)
if (args->sa_session)
return args->sa_session->clp->cl_minorversion;
#endif /* CONFIG_NFS_V4_1 */
return 0;
}

/*
* Encode an ACCESS request
*/
static int nfs4_xdr_enc_access(struct rpc_rqst *req, __be32 *p, const struct nfs4_accessargs *args)
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1414,7 +1424,7 @@ static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, __be32 *p, const struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1434,7 +1444,7 @@ static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, __be32 *p, const struc
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1453,7 +1463,7 @@ static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1472,7 +1482,7 @@ static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1495,7 +1505,7 @@ static int nfs4_xdr_enc_link(struct rpc_rqst *req, __be32 *p, const struct nfs4_
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1518,7 +1528,7 @@ static int nfs4_xdr_enc_create(struct rpc_rqst *req, __be32 *p, const struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand Down Expand Up @@ -1549,7 +1559,7 @@ static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, __be32 *p, const struct nf
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1567,7 +1577,7 @@ static int nfs4_xdr_enc_close(struct rpc_rqst *req, __be32 *p, struct nfs_closea
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1586,7 +1596,7 @@ static int nfs4_xdr_enc_open(struct rpc_rqst *req, __be32 *p, struct nfs_openarg
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand Down Expand Up @@ -1627,7 +1637,7 @@ static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, __be32 *p, struct nfs_
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1646,7 +1656,7 @@ static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, __be32 *p, struct n
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1665,7 +1675,7 @@ static int nfs4_xdr_enc_lock(struct rpc_rqst *req, __be32 *p, struct nfs_lock_ar
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1683,7 +1693,7 @@ static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, __be32 *p, struct nfs_lockt_
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1701,7 +1711,7 @@ static int nfs4_xdr_enc_locku(struct rpc_rqst *req, __be32 *p, struct nfs_locku_
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1719,7 +1729,7 @@ static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, __be32 *p, const struct n
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1740,7 +1750,7 @@ static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nf
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1764,7 +1774,7 @@ static int nfs4_xdr_enc_read(struct rpc_rqst *req, __be32 *p, struct nfs_readarg
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1786,7 +1796,7 @@ static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, __be32 *p, struct nfs_seta
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1807,7 +1817,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p,
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};
uint32_t replen;

Expand All @@ -1830,7 +1840,7 @@ static int nfs4_xdr_enc_write(struct rpc_rqst *req, __be32 *p, struct nfs_writea
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1850,7 +1860,7 @@ static int nfs4_xdr_enc_commit(struct rpc_rqst *req, __be32 *p, struct nfs_write
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1869,7 +1879,7 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs4_fsin
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1887,7 +1897,7 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, __be32 *p, const struct n
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1906,7 +1916,7 @@ static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, __be32 *p, const struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -1926,7 +1936,7 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, __be32 *p,
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand Down Expand Up @@ -2001,7 +2011,7 @@ static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, __be32 *p, const struc
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};

xdr_init_encode(&xdr, &req->rq_snd_buf, p);
Expand All @@ -2020,7 +2030,7 @@ static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};
uint32_t replen;

Expand Down Expand Up @@ -3996,7 +4006,7 @@ nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args
{
struct xdr_stream xdr;
struct compound_hdr hdr = {
.nops = 0,
.minorversion = nfs4_xdr_minorversion(&args->seq_args),
};
int status;

Expand Down

0 comments on commit 66cc042

Please sign in to comment.