From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 4 Nov 2010 15:57:30 +0000 (-0500)
Subject: UKERNEL: f_fsid is a struct on AIX
X-Git-Tag: upstream/1.8.0_pre1^2~4555
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7d6860c852296d96eac2785739bcfb9de76cd92d;p=packages%2Fo%2Fopenafs.git

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.

Change-Id: Ibd94d6b38b0cdc08b5812fe29e4e93344765ff05
Reviewed-on: http://gerrit.openafs.org/3260
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 d3baa8c98..53dd5efa8 100644
--- 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;
 }