Remove AFS_USEBUFFERS

The AFS_USEBUFFERS code has been disabled for all supported platforms
since the initial OpenAFS code drop. Simplify the buffers code by
removing it entirely.

Change-Id: Iab6b2d54361eca1a1446b4804b3d6533d75f2831
Reviewed-on: http://gerrit.openafs.org/894
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 4f45c38c9c0b35fa631ab09bd437c52966cadd19..1294a88ce840563171d12dc2068cfa9f9a53f197 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -1083,9 +1083,6 @@ struct buffer {
   char lockers;
   char dirty;
   char hashIndex;
-#if defined(AFS_USEBUFFERS)
-  struct buf *bufp;
-#endif
   afs_rwlock_t lock;          /* the lock for this structure */
 };
 

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index bb7ef6a42abbc964cc1044e842138244d72787a6..1254704a4888f5b98aaa17f0658a5ada6de7efc5 100644 (file)
--- a/src/afs/afs_buffer.c
+++ b/src/afs/afs_buffer.c
@@ -46,12 +46,7 @@
 #ifndef        BUF_TIME_MAX
 #define        BUF_TIME_MAX    0x7fffffff
 #endif
-#if defined(AFS_USEBUFFERS)
-/* number of pages per Unix buffer, when we're using Unix buffer pool */
-#define NPB 4
-#else
 #define NPB 8                  /* must be a pwer of 2 */
-#endif
 static int afs_max_buffers;    /* should be an integral multiple of NPB */
 
 /* page size */
@@ -115,9 +110,6 @@ DInit(int abuffers)
     /* Initialize the venus buffer system. */
     register int i;
     register struct buffer *tb;
-#if defined(AFS_USEBUFFERS)
-    struct buf *tub;           /* unix buffer for allocation */
-#endif
 
     AFS_STATCNT(DInit);
     if (dinit_flag)
@@ -125,11 +117,7 @@ DInit(int abuffers)
     dinit_flag = 1;
     /* round up to next multiple of NPB, since we allocate multiple pages per chunk */
     abuffers = ((abuffers - 1) | (NPB - 1)) + 1;
-#if defined(AFS_USEBUFFERS)
-    afs_max_buffers = abuffers;
-#else
     afs_max_buffers = abuffers << 2;           /* possibly grow up to 4 times as big */
-#endif
     LOCK_INIT(&afs_bufferLock, "afs_bufferLock");
     Buffers =
        (struct buffer *)afs_osi_Alloc(afs_max_buffers * sizeof(struct buffer));
@@ -140,12 +128,7 @@ DInit(int abuffers)
     for (i = 0; i < abuffers; i++) {
        if ((i & (NPB - 1)) == 0) {
            /* time to allocate a fresh buffer */
-#if defined(AFS_USEBUFFERS)
-           tub = geteblk(AFS_BUFFER_PAGESIZE * NPB);
-           BufferData = (char *)tub->b_un.b_addr;
-#else
            BufferData = (char *) afs_osi_Alloc(AFS_BUFFER_PAGESIZE * NPB);
-#endif
        }
        /* Fill in each buffer with an empty indication. */
        tb = &Buffers[i];
@@ -153,12 +136,6 @@ DInit(int abuffers)
        afs_reset_inode(&tb->inode);
        tb->accesstime = 0;
        tb->lockers = 0;
-#if defined(AFS_USEBUFFERS)
-       if ((i & (NPB - 1)) == 0)
-           tb->bufp = tub;
-       else
-           tb->bufp = 0;
-#endif
        tb->data = &BufferData[AFS_BUFFER_PAGESIZE * (i & (NPB - 1))];
        tb->hashIndex = 0;
        tb->dirty = 0;
@@ -599,18 +576,7 @@ shutdown_bufferpackage(void)
        dinit_flag = 0;
        tp = Buffers;
        for (i = 0; i < nbuffers; i += NPB, tp += NPB) {
-#if defined(AFS_USEBUFFERS)
-           /* The following check shouldn't be necessary and it will be removed soon */
-           if (!tp->bufp)
-               afs_warn
-                   ("afs: shutdown_bufferpackage: bufp == 0!! Shouldn't happen\n");
-           else {
-               brelse(tp->bufp);
-               tp->bufp = 0;
-           }
-#else
            afs_osi_Free(tp->data, NPB * AFS_BUFFER_PAGESIZE);
-#endif
        }
        afs_osi_Free(Buffers, nbuffers * sizeof(struct buffer));
        nbuffers = 0;

diff --git a/src/config/param.alpha_dux40.h b/src/config/param.alpha_dux40.h
index 88a4523688ebaa3dcbf0577b31f638ea75928586..675c5730245a785ae48f6211b2fbdc310e47d973 100644 (file)
--- a/src/config/param.alpha_dux40.h
+++ b/src/config/param.alpha_dux40.h
@@ -165,7 +165,6 @@ enum vcexcl { NONEXCL, EXCL };
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.alpha_dux50.h b/src/config/param.alpha_dux50.h
index 8ce02fb4a9527c237f8d0e8830f5c85f57573917..ab09a159850adb6a9e37533382936bbc8394ba7d 100644 (file)
--- a/src/config/param.alpha_dux50.h
+++ b/src/config/param.alpha_dux50.h
@@ -173,7 +173,6 @@ enum vcexcl { NONEXCL, EXCL };
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.alpha_dux51.h b/src/config/param.alpha_dux51.h
index 704c873e1f401b634035b396c6a698def1051cc8..c3d712bbf2709c965a1b4c6b3518211372c1a49e 100644 (file)
--- a/src/config/param.alpha_dux51.h
+++ b/src/config/param.alpha_dux51.h
@@ -174,7 +174,6 @@ enum vcexcl { NONEXCL, EXCL };
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.hp_ux102.h b/src/config/param.hp_ux102.h
index e140a06643015a4b9c0cbbbb156447909b510b82..420a158f5eacb6beeeeebcddfef6641333fe35ae 100644 (file)
--- a/src/config/param.hp_ux102.h
+++ b/src/config/param.hp_ux102.h
@@ -140,7 +140,6 @@ struct uio;
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h
index 5103b02be048437b8d3fc72f9e751d44ba2f04bd..5e3399183d21178008b2785af60984b1184f1b4e 100644 (file)
--- a/src/config/param.hp_ux110.h
+++ b/src/config/param.hp_ux110.h
@@ -147,7 +147,6 @@ struct uio;
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h
index 3ba156fff3da734378ab9f6e9d61dd0629f62caf..80a209546bbaa87fcb7f0dc0e890d7f251fd3da7 100644 (file)
--- a/src/config/param.hp_ux11i.h
+++ b/src/config/param.hp_ux11i.h
@@ -151,7 +151,6 @@ struct uio;
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h
index 911bd65f9f6a17cedd73c78139463ec19a65a9c0..d17eb3bfe4b24f57bab80461a8913ebdac1e146c 100644 (file)
--- a/src/config/param.rs_aix42.h
+++ b/src/config/param.rs_aix42.h
@@ -146,7 +146,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h
index cd49793baed6599abd33c2c261c235c3c487f3a0..83cb052b583b1f6de2e588986b886252374fdb63 100644 (file)
--- a/src/config/param.rs_aix51.h
+++ b/src/config/param.rs_aix51.h
@@ -155,7 +155,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.rs_aix52.h b/src/config/param.rs_aix52.h
index b20bb378dcbcae1cdbda0dd3b14daf6d1a456991..7a8b5978d04122b01c38fde21c274e7dbbadfd75 100644 (file)
--- a/src/config/param.rs_aix52.h
+++ b/src/config/param.rs_aix52.h
@@ -156,7 +156,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.rs_aix53.h b/src/config/param.rs_aix53.h
index ecfb3671a29cacb7453c02984c3d2e62dbfa39e1..4495ff69f1ccc139f4a63a41c9ab648128218549 100644 (file)
--- a/src/config/param.rs_aix53.h
+++ b/src/config/param.rs_aix53.h
@@ -157,7 +157,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.rs_aix61.h b/src/config/param.rs_aix61.h
index f0236ce1afbe5ffba5051a15768e7787031c7604..51c4cf8c77cbcde5aa0795443c73be291e5500ef 100644 (file)
--- a/src/config/param.rs_aix61.h
+++ b/src/config/param.rs_aix61.h
@@ -158,7 +158,6 @@
 #ifdef KERNEL\r
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */\r
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */\r
-/*#define      AFS_USEBUFFERS  1*/\r
 #define        afsio_iov       uio_iov\r
 #define        afsio_iovcnt    uio_iovcnt\r
 #define        afsio_offset    uio_offset\r

diff --git a/src/config/param.sgi_62.h b/src/config/param.sgi_62.h
index 3909d7b9a579c5587bb2fabb41cdd556e10e40dd..e7f28f7a461e84797ab9eadcc9804b558a98ee76 100644 (file)
--- a/src/config/param.sgi_62.h
+++ b/src/config/param.sgi_62.h
@@ -76,7 +76,6 @@
 #define        AFS_VFS34               1       /* afs/afs_vfsops.c (afs_vget), afs/afs_vnodeops.c (afs_lockctl, afs_noop) */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset
@@ -162,7 +161,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sgi_63.h b/src/config/param.sgi_63.h
index f3bec5f30083e365652a8d8c1e750442624793ae..6310e8b0315be4d7c33b704895ceda23a81fa52a 100644 (file)
--- a/src/config/param.sgi_63.h
+++ b/src/config/param.sgi_63.h
@@ -67,7 +67,6 @@
 #define        AFS_VFS34               1       /* afs/afs_vfsops.c (afs_vget), afs/afs_vnodeops.c (afs_lockctl, afs_noop) */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset
@@ -155,7 +154,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sgi_64.h b/src/config/param.sgi_64.h
index f04f613c0d13465b930730e2fdc7edfbd44831fc..da466755c3bc73256b87cb6918abcf4cc2b7ceb8 100644 (file)
--- a/src/config/param.sgi_64.h
+++ b/src/config/param.sgi_64.h
@@ -82,7 +82,6 @@
 #define        AFS_VFS34               1       /* afs/afs_vfsops.c (afs_vget), afs/afs_vnodeops.c (afs_lockctl, afs_noop) */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset
@@ -171,7 +170,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h
index 674bfac00f3511c53c91d40fc46635bbdd2dbcfb..646fad462a4da4db8abc256fff5fb270d7d1807b 100644 (file)
--- a/src/config/param.sgi_65.h
+++ b/src/config/param.sgi_65.h
@@ -92,7 +92,6 @@
 #define        AFS_VFS34               1       /* afs/afs_vfsops.c (afs_vget), afs/afs_vnodeops.c (afs_lockctl, afs_noop) */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset
@@ -187,7 +186,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sun4x_510.h b/src/config/param.sun4x_510.h
index c856f3300c77a5e8b4f8f60fa81674ce00b6b4ba..f708de62663262ebc29be6eb62c746283e17a3c7 100644 (file)
--- a/src/config/param.sun4x_510.h
+++ b/src/config/param.sun4x_510.h
@@ -73,7 +73,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_loffset
@@ -157,7 +156,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_offset

diff --git a/src/config/param.sun4x_511.h b/src/config/param.sun4x_511.h
index c01b1d629993e7aa25bfbc8948b921b9c6cb3227..a7a4d1f2bb9629c044da251fc3399b0640932805 100644 (file)
--- a/src/config/param.sun4x_511.h
+++ b/src/config/param.sun4x_511.h
@@ -74,7 +74,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_loffset
@@ -158,7 +157,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_offset

diff --git a/src/config/param.sun4x_55.h b/src/config/param.sun4x_55.h
index a0f3020fa0b6ccf8608b57b8c68d081ce9c48b55..dd76ff64805f3b1f02d26633e6b291f6b9874ac7 100644 (file)
--- a/src/config/param.sun4x_55.h
+++ b/src/config/param.sun4x_55.h
@@ -67,7 +67,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset
@@ -144,7 +143,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sun4x_56.h b/src/config/param.sun4x_56.h
index 25e49be179dd635a38bb7c82b3bc67896edb9ca5..fbf2587d549fc6063cd73afb8bb5e3746a424b66 100644 (file)
--- a/src/config/param.sun4x_56.h
+++ b/src/config/param.sun4x_56.h
@@ -69,7 +69,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -147,7 +146,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sun4x_57.h b/src/config/param.sun4x_57.h
index 11c2e207d8f053801387625269a923d8d9961f63..ce7ab8e65c2dc0341267870314c6ca857e67a4cf 100644 (file)
--- a/src/config/param.sun4x_57.h
+++ b/src/config/param.sun4x_57.h
@@ -71,7 +71,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -162,7 +161,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h
index 0d078707a857ee268f9f110baa16b4154a4a1918..02f77e6420cad25a7b6f7b548fc065410c9f47dc 100644 (file)
--- a/src/config/param.sun4x_58.h
+++ b/src/config/param.sun4x_58.h
@@ -69,7 +69,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -155,7 +154,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h
index b5ad164593cae7778b078e623bab3e0dfa6d70b7..62a198153b90306205f013d0d14e0127335ad88b 100644 (file)
--- a/src/config/param.sun4x_59.h
+++ b/src/config/param.sun4x_59.h
@@ -70,7 +70,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -157,7 +156,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sunx86_510.h b/src/config/param.sunx86_510.h
index b354fbd110d1213df3422bb7768fe7ce988f3c1a..88b4cb25480df8cb3508c2f7dce2002c9d091211 100644 (file)
--- a/src/config/param.sunx86_510.h
+++ b/src/config/param.sunx86_510.h
@@ -83,7 +83,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_loffset
@@ -167,7 +166,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_offset

diff --git a/src/config/param.sunx86_511.h b/src/config/param.sunx86_511.h
index 6a67e93384bfa7868b5e2558f402db6db967c621..964687b207da13e4c15c1d07ded398f168dfff1f 100644 (file)
--- a/src/config/param.sunx86_511.h
+++ b/src/config/param.sunx86_511.h
@@ -84,7 +84,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_loffset
@@ -168,7 +167,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt            uio_iovcnt
 #define        afsio_offset            uio_offset

diff --git a/src/config/param.sunx86_54.h b/src/config/param.sunx86_54.h
index e61c5c15266f48af57e2248fe58442d824edc7a9..43156c5e1deada6bec620f24e8ed31665e98179b 100644 (file)
--- a/src/config/param.sunx86_54.h
+++ b/src/config/param.sunx86_54.h
@@ -53,7 +53,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sunx86_57.h b/src/config/param.sunx86_57.h
index 809613ef05033d5843cca582af2ceaf4a4556f17..8dd0b1538a37d3cb05c6c6505bdcfd846e700845 100644 (file)
--- a/src/config/param.sunx86_57.h
+++ b/src/config/param.sunx86_57.h
@@ -74,7 +74,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -155,7 +154,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h
index 8c8d0184bac33d8041c48e104ca150172ab2ddeb..3f8cec6d69b17e2cdf7aef6b1aed57e2c3347ec9 100644 (file)
--- a/src/config/param.sunx86_58.h
+++ b/src/config/param.sunx86_58.h
@@ -80,7 +80,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -161,7 +160,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/config/param.sunx86_59.h b/src/config/param.sunx86_59.h
index 31265c20dff5028c72ee315bef0a55555543dbda..507e437e31ce379587f0743a6b2a3c0e48098eac 100644 (file)
--- a/src/config/param.sunx86_59.h
+++ b/src/config/param.sunx86_59.h
@@ -81,7 +81,6 @@
 /* sun definitions here */
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov               uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_loffset
@@ -165,7 +164,6 @@
 #ifdef KERNEL
 #define        AFS_UIOFMODE            1       /* Only in afs/afs_vnodeops.c (afs_ustrategy) */
 #define        AFS_SYSVLOCK            1       /* sys v locking supported */
-/*#define      AFS_USEBUFFERS  1*/
 #define        afsio_iov       uio_iov
 #define        afsio_iovcnt    uio_iovcnt
 #define        afsio_offset    uio_offset

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index b3e1c56ec97de76dc7fcfb8ea4bb85b35407ecf4..ff96e99e08e71e633a4b1a79ab33e9f5406c9a58 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -2103,13 +2103,11 @@ print_allocs(int pnt)
     T += i;
     printf("%20s:\t%8d bytes\t[%d entries/%d bytes each]\n", "Buffer package",
           i, j, sizeof(struct buffer));
-#if    !AFS_USEBUFFERS
 #define        AFS_BUFFER_PAGESIZE 2048
     i = j * AFS_BUFFER_PAGESIZE;
     T += i;
     printf("%20s:\t%8d bytes\t[%d entries/%d bytes each]\n",
           "Xtra Buffer pkg area", i, j, AFS_BUFFER_PAGESIZE);
-#endif
 
     Sum_exps = 0;
     Sum_nfssysnames = 0;