UKERNEL: f_fsid is a struct on AIX

The statvfs f_fsid member is a struct with two fields on AIX when
_ALL_SOURCE is defined (which we define to get various extensions). So
in the AIX case, use it as such a struct instead of a single integer.

Reviewed-on: http://gerrit.openafs.org/3260
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 7d6860c852296d96eac2785739bcfb9de76cd92d)

Change-Id: If8912f8cba8e12525f12f75cd53cf77bb7d4c547
Reviewed-on: http://gerrit.openafs.org/3510
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/UKERNEL/osi_vfsops.c b/src/afs/UKERNEL/osi_vfsops.c
index d3baa8c98dffe0efddeb70c04397ea4fb25847b6..53dd5efa809224499b3fc92210c7d8333c3b4642 100644 (file)
--- a/src/afs/UKERNEL/osi_vfsops.c
+++ b/src/afs/UKERNEL/osi_vfsops.c
@@ -125,7 +125,13 @@ afs_statvfs(struct vfs *afsp, struct statvfs *abp)
     abp->f_bsize = afsp->vfs_bsize;
     abp->f_blocks = abp->f_bfree = abp->f_bavail = abp->f_files =
       abp->f_ffree = 9000000;
+
+#ifdef AFS_USR_AIX_ENV
+    abp->f_fsid.val[0] = AFS_VFSMAGIC;
+    abp->f_fsid.val[1] = AFS_VFSFSID;
+#else
     abp->f_fsid = (AFS_VFSMAGIC << 16) || AFS_VFSFSID;
+#endif
 
     return 0;
 }