Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93b717fd authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Label stateids with the type 



In order to more easily distinguish what kind of stateid we are dealing
with, introduce a type that can be used to label the stateid structure.

The label will be useful both for debugging, but also when dealing with
operations like SETATTR, READ and WRITE that can take several different
types of stateid as arguments.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 9a8f6b5e

fs/nfs/callback_xdr.c

+14 −3
Original line number Diff line number Diff line
@@ -146,10 +146,16 @@ static __be32 decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) 
	p = read_buf(xdr, NFS4_STATEID_SIZE);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	memcpy(stateid, p, NFS4_STATEID_SIZE);

	memcpy(stateid->data, p, NFS4_STATEID_SIZE);

	return 0;

}



static __be32 decode_delegation_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{

	stateid->type = NFS4_DELEGATION_STATEID_TYPE;

	return decode_stateid(xdr, stateid);

}



static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound_hdr_arg *hdr)

{

	__be32 *p;
@@ -211,7 +217,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
	__be32 *p;

	__be32 status;



	status = decode_stateid(xdr, &args->stateid);

	status = decode_delegation_stateid(xdr, &args->stateid);

	if (unlikely(status != 0))

		goto out;

	p = read_buf(xdr, 4);
@@ -227,6 +233,11 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
}



#if defined(CONFIG_NFS_V4_1)

static __be32 decode_layout_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{

	stateid->type = NFS4_LAYOUT_STATEID_TYPE;

	return decode_stateid(xdr, stateid);

}



static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,

				       struct xdr_stream *xdr,
@@ -263,7 +274,7 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp, 
		}

		p = xdr_decode_hyper(p, &args->cbl_range.offset);

		p = xdr_decode_hyper(p, &args->cbl_range.length);

		status = decode_stateid(xdr, &args->cbl_stateid);

		status = decode_layout_stateid(xdr, &args->cbl_stateid);

		if (unlikely(status != 0))

			goto out;

	} else if (args->cbl_recall_type == RETURN_FSID) {

fs/nfs/flexfilelayout/flexfilelayout.c

+4 −3
Original line number Diff line number Diff line
@@ -55,14 +55,15 @@ ff_layout_free_layout_hdr(struct pnfs_layout_hdr *lo) 
	kfree(FF_LAYOUT_FROM_HDR(lo));

}



static int decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

static int decode_pnfs_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{

	__be32 *p;



	p = xdr_inline_decode(xdr, NFS4_STATEID_SIZE);

	if (unlikely(p == NULL))

		return -ENOBUFS;

	memcpy(stateid, p, NFS4_STATEID_SIZE);

	stateid->type = NFS4_PNFS_DS_STATEID_TYPE;

	memcpy(stateid->data, p, NFS4_STATEID_SIZE);

	dprintk("%s: stateid id= [%x%x%x%x]\n", __func__,

		p[0], p[1], p[2], p[3]);

	return 0;
@@ -465,7 +466,7 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh, 
		fls->mirror_array[i]->efficiency = be32_to_cpup(p);



		/* stateid */

		rc = decode_stateid(&stream, &fls->mirror_array[i]->stateid);

		rc = decode_pnfs_stateid(&stream, &fls->mirror_array[i]->stateid);

		if (rc)

			goto out_err_free;

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ ff_ds_error_match(const struct nfs4_ff_layout_ds_err *e1, 
		return e1->opnum < e2->opnum ? -1 : 1;

	if (e1->status != e2->status)

		return e1->status < e2->status ? -1 : 1;

	ret = memcmp(&e1->stateid, &e2->stateid, sizeof(e1->stateid));

	ret = memcmp(e1->stateid.data, e2->stateid.data,

			sizeof(e1->stateid.data));

	if (ret != 0)

		return ret;

	ret = memcmp(&e1->deviceid, &e2->deviceid, sizeof(e1->deviceid));

fs/nfs/nfs4_fs.h

+5 −2
Original line number Diff line number Diff line
@@ -496,12 +496,15 @@ extern struct svc_version nfs4_callback_version4; 


static inline void nfs4_stateid_copy(nfs4_stateid *dst, const nfs4_stateid *src)

{

	memcpy(dst, src, sizeof(*dst));

	memcpy(dst->data, src->data, sizeof(dst->data));

	dst->type = src->type;

}



static inline bool nfs4_stateid_match(const nfs4_stateid *dst, const nfs4_stateid *src)

{

	return memcmp(dst, src, sizeof(*dst)) == 0;

	if (dst->type != src->type)

		return false;

	return memcmp(dst->data, src->data, sizeof(dst->data)) == 0;

}



static inline bool nfs4_stateid_match_other(const nfs4_stateid *dst, const nfs4_stateid *src)

fs/nfs/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -8675,6 +8675,9 @@ nfs41_free_lock_state(struct nfs_server *server, struct nfs4_lock_state *lsp) 
static bool nfs41_match_stateid(const nfs4_stateid *s1,

		const nfs4_stateid *s2)

{

	if (s1->type != s2->type)

		return false;



	if (memcmp(s1->other, s2->other, sizeof(s1->other)) != 0)

		return false;