From: Michael Niksch <nik@zurich.ibm.com>
Date: Wed, 11 Sep 2002 09:18:09 +0000 (+0000)
Subject: STABLE12-aix-namei-fileserver-fix-20020911
X-Git-Tag: openafs-stable-1_2_7~12
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b414f7e77257fa02497742f56d107f5cb9d519ae;p=packages%2Fo%2Fopenafs.git

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 f25ec5d4e..b2f3d291d 100644
--- 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 460456f08..73a694694 100644
--- 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 9d4cc1057..876b4d438 100644
--- 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"