[master] 789ccc4fe ws: Retire WS_Reserve()

[Dridi Boukelmoune]

commit 789ccc4fe10490fd39b5d09a5c1c6c199bf7266d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Apr 29 18:29:18 2020 +0200

    ws: Retire WS_Reserve()

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index c8ad67d1c..c09b5cef6 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -778,8 +778,6 @@ void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func,
 
 void WS_Init(struct ws *ws, const char *id, void *space, unsigned len);
 
-/* WS_Reserve(): Use WS_ReserveSize() or WS_ReserveAll() */
-unsigned WS_Reserve(struct ws *ws, unsigned bytes) v_deprecated_;
 unsigned WS_ReserveSize(struct ws *, unsigned);
 unsigned WS_ReserveAll(struct ws *);
 unsigned WS_ReserveLumps(struct ws *ws, size_t sz);
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index a1e511d30..680983d91 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -307,30 +307,6 @@ WS_ReserveSize(struct ws *ws, unsigned bytes)
 	return (pdiff(ws->f, ws->r));
 }
 
-/* REL_20200915 remove */
-unsigned
-WS_Reserve(struct ws *ws, unsigned bytes)
-{
-	unsigned b2;
-
-	WS_Assert(ws);
-	assert(ws->r == NULL);
-
-	b2 = PRNDDN(ws->e - ws->f);
-	if (bytes != 0 && bytes < b2)
-		b2 = PRNDUP(bytes);
-
-	if (ws->f + b2 > ws->e) {
-		WS_MarkOverflow(ws);
-		return (0);
-	}
-	ws->r = ws->f + b2;
-	DSL(DBG_WORKSPACE, 0, "WS_Reserve(%p, %u/%u) = %u",
-	    ws, b2, bytes, pdiff(ws->f, ws->r));
-	WS_Assert(ws);
-	return (pdiff(ws->f, ws->r));
-}
-
 unsigned
 WS_ReserveLumps(struct ws *ws, size_t sz)
 {
diff --git a/include/vrt.h b/include/vrt.h
index 365f59b1c..8a7e76e16 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -55,6 +55,7 @@
  * NEXT (2020-09-15)
  *	Added VRT_DirectorResolve()
  *	Added VCL_STRING VRT_BLOB_string(VRT_CTX, VCL_BLOB)
+ *	[cache.h] WS_Reserve() removed
  * 11.0 (2020-03-16)
  *	Changed type of vsa_suckaddr_len from int to size_t
  *	New prefix_{ptr|len} fields in vrt_backend