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

Commit 94499252 authored by Alexandros Batsakis's avatar Alexandros Batsakis Committed by Trond Myklebust
Browse files

NFS: change stateid to be a union 



In NFSv4.1 the stateid consists of the other and seqid fields. For layout
processing we need to numerically compare the seqid value of layout stateids.
To do so, introduce a union to nfs4_stateid to switch between opaque(16 bytes)
and opaque(12 bytes) / __be32

Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c772567d

fs/nfs/callback_proc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -118,11 +118,11 @@ int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation, const n 
	if (delegation == NULL)

	if (delegation == NULL)

		return 0;

		return 0;





	/* seqid is 4-bytes long */

	if (stateid->stateid.seqid != 0)

	if (((u32 *) &stateid->data)[0] != 0)

		return 0;

		return 0;

	if (memcmp(&delegation->stateid.data[4], &stateid->data[4],

	if (memcmp(&delegation->stateid.stateid.other,

		   sizeof(stateid->data)-4))

		   &stateid->stateid.other,

		   NFS4_STATEID_OTHER_SIZE))

		return 0;

		return 0;





	return 1;

	return 1;

include/linux/nfs4.h

+13 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,9 @@ 




#define NFS4_BITMAP_SIZE	2

#define NFS4_BITMAP_SIZE	2

#define NFS4_VERIFIER_SIZE	8

#define NFS4_VERIFIER_SIZE	8

#define NFS4_STATEID_SIZE	16

#define NFS4_STATEID_SEQID_SIZE 4

#define NFS4_STATEID_OTHER_SIZE 12

#define NFS4_STATEID_SIZE	(NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE)

#define NFS4_FHSIZE		128

#define NFS4_FHSIZE		128

#define NFS4_MAXPATHLEN		PATH_MAX

#define NFS4_MAXPATHLEN		PATH_MAX

#define NFS4_MAXNAMLEN		NAME_MAX

#define NFS4_MAXNAMLEN		NAME_MAX
@@ -167,7 +169,16 @@ struct nfs4_acl { 
};

};





typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;

typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;

typedef struct { char data[NFS4_STATEID_SIZE]; } nfs4_stateid;



struct nfs41_stateid {

	__be32 seqid;

	char other[NFS4_STATEID_OTHER_SIZE];

} __attribute__ ((packed));



typedef union {

	char data[NFS4_STATEID_SIZE];

	struct nfs41_stateid stateid;

} nfs4_stateid;





enum nfs_opnum4 {

enum nfs_opnum4 {

	OP_ACCESS = 3,

	OP_ACCESS = 3,