afs: afs_osi_Alloc_NoSleep() cleanup

afs_osi_Alloc_NoSleep() is no longer used by the SOLARIS or IRIX
clients.  It is used by the *BSD code in rx, so just let those
platforms define/prototype it in their osi_machdep.h

Change-Id: Ie2e4a6f7520329c345ac63c67d7b156ed21d109f
Reviewed-on: http://gerrit.openafs.org/3010
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h
index 5bc44545ca61a18c1829da74bc5fe83cf8a7d194..86f1bdb5665b424035d1559ef0634dd07119097b 100644 (file)
--- a/src/afs/FBSD/osi_machdep.h
+++ b/src/afs/FBSD/osi_machdep.h
@@ -79,7 +79,6 @@ extern int (**afs_vnodeop_p) ();
 extern void *osi_fbsd_alloc(size_t size, int dropglobal);
 extern void osi_fbsd_free(void *p);
 
-#undef afs_osi_Alloc_NoSleep
 #define afs_osi_Alloc_NoSleep(size) osi_fbsd_alloc((size), 0)
 
 #ifdef AFS_FBSD80_ENV

diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h
index 02b6e8abc4d0aa2b84be5430c97bc746710478ce..0ee293759ddd4785e74b6473c914149b2e0fcb2f 100644 (file)
--- a/src/afs/IRIX/osi_machdep.h
+++ b/src/afs/IRIX/osi_machdep.h
@@ -38,10 +38,6 @@ typedef struct proc afs_proc_t;
 
 #define osi_vnhold(avc, r)  do { VN_HOLD(AFSTOV(avc)); } while(0)
 
-#undef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t size);
-
-
 #ifdef AFS_SGI64_ENV
 #include <sys/flock.h>
 extern flid_t osi_flid;

diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h
index 3e8c886816463dea0960acc2aaa34559da40ce5b..31474452544b0f3e2798bf4d8acedecca55fd072 100644 (file)
--- a/src/afs/SOLARIS/osi_machdep.h
+++ b/src/afs/SOLARIS/osi_machdep.h
@@ -54,9 +54,6 @@ local_osi_Time()
 #define osi_Time() (hrestime.tv_sec)
 #endif
 
-#undef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t size);
-
 #ifdef AFS_SUN58_ENV
 # define osi_vnhold(avc, r)  do {    \
     struct vnode *vp = AFSTOV(avc); \

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 5d0bdc92507b12f014d2b36f8c5eee733b53655f..2bb57f5a2a7680e70a5981c8448eb04fc6f91a08 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -124,12 +124,6 @@ struct afs_osi_WaitHandle {
 
 #define        osi_NPACKETS    20      /* number of cluster pkts to alloc */
 
-/*
- * Alloc declarations.
- */
-#if !defined(AFS_OBSD44_ENV) && !defined(AFS_NBSD_ENV)
-#define afs_osi_Alloc_NoSleep afs_osi_Alloc
-#endif
 
 /*
  * Default vnode related macros

diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c
index fa750c4e5b807612384412fd954b0fc870e52072..4d7b22961bdf104128e3f6af8ecf556a5272b617 100644 (file)
--- a/src/afs/afs_osi_alloc.c
+++ b/src/afs/afs_osi_alloc.c
@@ -76,29 +76,6 @@ afs_osi_Alloc(size_t x)
 #endif
 }
 
-#if    defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
-
-void *
-afs_osi_Alloc_NoSleep(size_t x)
-{
-    struct osimem *tm;
-    int size;
-
-    AFS_STATCNT(osi_Alloc);
-    /* 0-length allocs may return NULL ptr from AFS_KALLOC, so we special-case
-     * things so that NULL returned iff an error occurred */
-    if (x == 0)
-       return &memZero;
-
-    size = x;
-    AFS_STATS(afs_stats_cmperf.OutStandingAllocs++);
-    AFS_STATS(afs_stats_cmperf.OutStandingMemUsage += x);
-    tm = (struct osimem *)AFS_KALLOC_NOSLEEP(size);
-    return (void *)tm;
-}
-
-#endif /* SUN || SGI */
-
 void
 afs_osi_Free(void *x, size_t asize)
 {

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index c99beaaf721dd9f858eb6662ed6586cac3a82ebf..93a2d12a97ea71a98d0ce99c9e425d37c7d20818 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -556,9 +556,6 @@ extern afs_lock_t osi_flplock;
 #endif
 
 extern void *afs_osi_Alloc_debug(size_t x, char *func, int line);
-#ifndef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t x);
-#endif
 #ifndef afs_osi_Free
 extern void afs_osi_Free(void *x, size_t asize);
 #endif

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 91fc74d4d90ace123a7f302286da67ad21979c37..8d9e736f7856ccbf1f92e92f4dbf48ab2a2ae798 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -657,9 +657,6 @@ extern void rx_SetMaxMTU(int mtu);
 #ifndef afs_osi_Alloc
 extern void *afs_osi_Alloc(size_t x);
 #endif
-#ifndef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t x);
-#endif
 #ifndef afs_osi_Free
 extern void afs_osi_Free(void *x, size_t asize);
 #endif

diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index d23e6106c326a0fa3c98cb35015bf1d88e2c03f9..82dbe525435fd21e35a0147f26ed3a7740578b31 100644 (file)
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -108,9 +108,6 @@ typedef char * caddr_t;
 /* keep here for now, 64 bit issues */
 #ifndef AFS_OBSD44_ENV
 extern void *afs_osi_Alloc(size_t x);
-#ifndef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t x);
-#endif
 extern void afs_osi_Free(void *x, size_t asize);
 #endif