diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-04 18:13:57 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-06 10:32:47 -0500 |
commit | 2d2f24add1ff903ff8e0ce61c5c05635cc636985 (patch) | |
tree | 132ddb133179b95931d42a19e79d25f2db33339c /include/linux/nfs4.h | |
parent | f597c53790f662662281b82b7692a22d2a4d4afa (diff) | |
download | linux-stable-2d2f24add1ff903ff8e0ce61c5c05635cc636985.tar.gz linux-stable-2d2f24add1ff903ff8e0ce61c5c05635cc636985.tar.bz2 linux-stable-2d2f24add1ff903ff8e0ce61c5c05635cc636985.zip |
NFSv4: Simplify the struct nfs4_stateid
Replace the union with the common struct stateid4 as defined in both
RFC3530 and RFC5661. This makes it easier to access the sequence id,
which will again make implementing support for parallel OPEN calls
easier.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs4.h')
-rw-r--r-- | include/linux/nfs4.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 32345c2805c0..834df8bf08b6 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -183,15 +183,12 @@ struct nfs4_acl { typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier; -struct nfs41_stateid { +struct nfs_stateid4 { __be32 seqid; char other[NFS4_STATEID_OTHER_SIZE]; } __attribute__ ((packed)); -typedef union { - char data[NFS4_STATEID_SIZE]; - struct nfs41_stateid stateid; -} nfs4_stateid; +typedef struct nfs_stateid4 nfs4_stateid; enum nfs_opnum4 { OP_ACCESS = 3, |