STABLE12-aix-namei-fileserver-fix-20020911

make namei fileserver work on aix

(cherry picked from commit 8790c0759c5c920fce035945a9d2fdd05fa9a75d)

diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h
index f25ec5d4e4a32c062643a452e7ad03e79b17062d..b2f3d291d795e470b6a5d6939f7b8c815bfe5613 100644 (file)
--- a/src/config/param.rs_aix42.h
+++ b/src/config/param.rs_aix42.h
@@ -15,6 +15,10 @@
 #define        AFS_AIX41_ENV           1
 #define AFS_AIX42_ENV          1
 
+#ifdef AFS_NAMEI_ENV
+#define AFS_64BIT_IOPS_ENV      1       /* needed for NAMEI... */
+#endif
+
 #include <afs/afs_sysnames.h>
 
 /* Global lock in AFS part of client. */

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 460456f0873c891899a1b59345e084d79671d59f..73a694694c8e9fbea894f1e6ac8fa22212ca6220 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -506,6 +506,7 @@ int VAttachPartitions(void)
            continue; /* Ignore any "special" partitions */
 
 #ifdef AFS_AIX42_ENV
+#ifndef AFS_NAMEI_ENV
        {
            struct superblock fs;
            /* The Log statements are non-sequiters in the SalvageLog and don't
@@ -522,6 +523,7 @@ int VAttachPartitions(void)
                continue;
            }
        }
+#endif
 #endif
 
        /* If we're going to always attach this partition, do it later. */

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 9d4cc105759bed00f7e5fb11c8fd932e4346e45a..876b4d438e1c4b1815c9b8f4b2dd9a93caecb62d 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -824,6 +824,7 @@ struct stat *status;
 #endif
 
 #ifdef AFS_AIX42_ENV
+#ifndef AFS_NAMEI_ENV
 /* We don't want to salvage big files filesystems, since we can't put volumes on
  * them.
  */
@@ -852,6 +853,7 @@ int CheckIfBigFilesFS(mountPoint, devName)
     return 0;
 }
 #endif
+#endif
 
 #ifdef AFS_NT40_ENV
 #define HDSTR "\\Device\\Harddisk"