From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 30 Nov 2007 19:17:01 +0000 (+0000)
Subject: DEVEL15-aix-pin-small-allocs-20071130
X-Git-Tag: openafs-devel-1_5_28~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=952d757b41a2f1c24c217f287b83732a753e439b;p=packages%2Fo%2Fopenafs.git

DEVEL15-aix-pin-small-allocs-20071130

LICENSE IPL10

we assume the small alloc pool is pinned. maybe we should pin it.


(cherry picked from commit f9fddc03ec2f36528953f5264263458bf730506e)
---

diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c
index 9df230a80..158bc32c7 100644
--- a/src/afs/afs_osi_alloc.c
+++ b/src/afs/afs_osi_alloc.c
@@ -207,7 +207,11 @@ osi_AllocSmallSpace(size_t size)
     if (!freeSmallList) {
 	afs_stats_cmperf.SmallBlocksAlloced++;
 	afs_stats_cmperf.SmallBlocksActive++;
-	return afs_osi_Alloc(AFS_SMALLOCSIZ);
+	tp = afs_osi_Alloc(AFS_SMALLOCSIZ);
+#ifdef KERNEL_HAVE_PIN
+        pin((char *)tp, AFS_SMALLOCSIZ);
+#endif
+        return (char *)tp;
     }
     afs_stats_cmperf.SmallBlocksActive++;
     MObtainWriteLock(&osi_fsplock, 327);
diff --git a/src/vol/partition.c b/src/vol/partition.c
index 1e665fc53..8963854f9 100644
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -456,7 +456,7 @@ VAttachPartitions(void)
 	/* but allow zfs too if we're in the NAMEI environment */
 	if (
 #ifdef AFS_NAMEI_ENV
-	    ((!(strcmp(mnt.mnt_fstype, "ufs") &&
+	    (((strcmp(mnt.mnt_fstype, "ufs") &&
 		strcmp(mnt.mnt_fstype, "zfs"))))
 #else
 	    (strcmp(mnt.mnt_fstype, "ufs") != 0)