1 files changed, 12 insertions, 7 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index e206c07080fe..95682f7d738a 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -14,11 +14,19 @@
 #define NFS_DEF_FILE_IO_SIZE    (4096U)
 #define NFS_MIN_FILE_IO_SIZE    (1024U)
 
-struct nfs4_fsid {
-        __u64 major;
-        __u64 minor;
+struct nfs_fsid {
+        uint64_t                major;
+        uint64_t                minor;
 };
 
+/*
+ * Helper for checking equality between 2 fsids.
+ */
+static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid *b)
+{
+        return a->major == b->major && a->minor == b->minor;
+}
+
 struct nfs_fattr {
         unsigned short          valid;          /* which fields are valid */
         __u64                   pre_size;       /* pre_op_attr.size       */
@@ -40,10 +48,7 @@ struct nfs_fattr {
                 } nfs3;
         } du;
         dev_t                   rdev;
-        union {
-                __u64           nfs3;           /* also nfs2 */
-                struct nfs4_fsid nfs4;
-        } fsid_u;
+        struct nfs_fsid         fsid;
         __u64                   fileid;
         struct timespec         atime;
         struct timespec         mtime;