diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2012-03-21 16:42:14 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-26 11:48:54 -0400 |
| commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
| tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /include/linux/nfs4.h | |
| parent | NFSD: Fix nfs4_verifier memory alignment (diff) | |
| parent | NFS: fix sb->s_id in nfs debug prints (diff) | |
| download | linux-dev-1df00640c9111c881633d9b219f18e66c52599ec.tar.xz linux-dev-1df00640c9111c881633d9b219f18e66c52599ec.zip | |
Merge nfs containerization work from Trond's tree
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.
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 8cdde4d1fad8..0987146b0637 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, |