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>

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ce0ad81dd466..e0e35288361c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6271,13 +6271,12 @@ static int nfs41_free_stateid(struct nfs_server *server, nfs4_stateid *stateid)
 static bool nfs41_match_stateid(const nfs4_stateid *s1,
                 const nfs4_stateid *s2)
 {
-        if (memcmp(s1->stateid.other, s2->stateid.other,
-                   sizeof(s1->stateid.other)) != 0)
+        if (memcmp(s1->other, s2->other, sizeof(s1->other)) != 0)
                 return false;
 
-        if (s1->stateid.seqid == s2->stateid.seqid)
+        if (s1->seqid == s2->seqid)
                 return true;
-        if (s1->stateid.seqid == 0 || s2->stateid.seqid == 0)
+        if (s1->seqid == 0 || s2->seqid == 0)
                 return true;
 
         return false;