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 9df230a801b1fc87e0ecf16895a0f6ac99b42972..158bc32c7c3289541ff53af1567e5956d640b252 100644 (file)
--- 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 1e665fc5383147332d0a5fd3779c1d0b6742426c..8963854f9bd0a772c74720be210164da82fe4d76 100644 (file)
--- 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)