From 03b5994d7bec0088d0edbfc83f5820c089ac9599 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 6 Dec 2009 14:25:08 +0000 Subject: [PATCH] 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 Tested-by: Andrew Deason Reviewed-by: Derrick Brashear --- src/afs/afs.h | 3 --- src/afs/afs_buffer.c | 34 ---------------------------------- src/config/param.alpha_dux40.h | 1 - src/config/param.alpha_dux50.h | 1 - src/config/param.alpha_dux51.h | 1 - src/config/param.hp_ux102.h | 1 - src/config/param.hp_ux110.h | 1 - src/config/param.hp_ux11i.h | 1 - src/config/param.rs_aix42.h | 1 - src/config/param.rs_aix51.h | 1 - src/config/param.rs_aix52.h | 1 - src/config/param.rs_aix53.h | 1 - src/config/param.rs_aix61.h | 1 - src/config/param.sgi_62.h | 2 -- src/config/param.sgi_63.h | 2 -- src/config/param.sgi_64.h | 2 -- src/config/param.sgi_65.h | 2 -- src/config/param.sun4x_510.h | 2 -- src/config/param.sun4x_511.h | 2 -- src/config/param.sun4x_55.h | 2 -- src/config/param.sun4x_56.h | 2 -- src/config/param.sun4x_57.h | 2 -- src/config/param.sun4x_58.h | 2 -- src/config/param.sun4x_59.h | 2 -- src/config/param.sunx86_510.h | 2 -- src/config/param.sunx86_511.h | 2 -- src/config/param.sunx86_54.h | 1 - src/config/param.sunx86_57.h | 2 -- src/config/param.sunx86_58.h | 2 -- src/config/param.sunx86_59.h | 2 -- src/venus/kdump.c | 2 -- 31 files changed, 83 deletions(-) diff --git a/src/afs/afs.h b/src/afs/afs.h index 4f45c38c9..1294a88ce 100644 --- 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 bb7ef6a42..1254704a4 100644 --- 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 88a452368..675c57302 100644 --- 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 8ce02fb4a..ab09a1598 100644 --- 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 704c873e1..c3d712bbf 100644 --- 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 e140a0664..420a158f5 100644 --- 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 5103b02be..5e3399183 100644 --- 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 3ba156fff..80a209546 100644 --- 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 911bd65f9..d17eb3bfe 100644 --- 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 cd49793ba..83cb052b5 100644 --- 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 b20bb378d..7a8b5978d 100644 --- 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 ecfb3671a..4495ff69f 100644 --- 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 f0236ce1a..51c4cf8c7 100644 --- a/src/config/param.rs_aix61.h +++ b/src/config/param.rs_aix61.h @@ -158,7 +158,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_62.h b/src/config/param.sgi_62.h index 3909d7b9a..e7f28f7a4 100644 --- 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 f3bec5f30..6310e8b03 100644 --- 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 f04f613c0..da466755c 100644 --- 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 674bfac00..646fad462 100644 --- 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 c856f3300..f708de626 100644 --- 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 c01b1d629..a7a4d1f2b 100644 --- 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 a0f3020fa..dd76ff648 100644 --- 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 25e49be17..fbf2587d5 100644 --- 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 11c2e207d..ce7ab8e65 100644 --- 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 0d078707a..02f77e642 100644 --- 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 b5ad16459..62a198153 100644 --- 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 b354fbd11..88b4cb254 100644 --- 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 6a67e9338..964687b20 100644 --- 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 e61c5c152..43156c5e1 100644 --- 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 809613ef0..8dd0b1538 100644 --- 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 8c8d0184b..3f8cec6d6 100644 --- 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 31265c20d..507e437e3 100644 --- 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 b3e1c56ec..ff96e99e0 100644 --- 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; -- 2.39.5