MINOR: shctx: Remove redundant arg from free_block callback

The free_block callback does not get called on blocks that are not row
heads anymore so we don't need too shared_block parameters.

diff --git a/include/haproxy/shctx-t.h b/include/haproxy/shctx-t.h
index 4f14759d4db224926beae878b567981dc04b9582..12eec3cab13915fbd2729919c59c598d2e01cb86 100644 (file)
--- a/include/haproxy/shctx-t.h
+++ b/include/haproxy/shctx-t.h
@@ -50,7 +50,7 @@ struct shared_context {
        struct list avail;  /* list for active and free blocks */
        unsigned int nbav;  /* number of available blocks */
        unsigned int max_obj_size;   /* maximum object size (in bytes). */
-       void (*free_block)(struct shared_block *first, struct shared_block *block, void *data);
+       void (*free_block)(struct shared_block *first, void *data);
        void (*reserve_finish)(struct shared_context *shctx);
        void *cb_data;
        short int block_size;

diff --git a/src/cache.c b/src/cache.c
index 16c1a16b75e728ee8fc0f4faf1ff4fcdefd64a56..5ae3ef0851dfc2b73c72b6a8938a82a3bb68434a 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -983,9 +983,9 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
 }
 
 
-static void cache_free_blocks(struct shared_block *first, struct shared_block *block, void *data)
+static void cache_free_blocks(struct shared_block *first, void *data)
 {
-       struct cache_entry *object = (struct cache_entry *)block->data;
+       struct cache_entry *object = (struct cache_entry *)first->data;
        struct cache *cache = (struct cache *)data;
        struct cache_tree *cache_tree;
 

diff --git a/src/shctx.c b/src/shctx.c
index 299f57f2adb51944576ba2d8cae4ab00c14ff168..1a57e1c5899208ee0b85dfabf486ed954082b86a 100644 (file)
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -81,7 +81,7 @@ struct shared_block *shctx_row_reserve_hot(struct shared_context *shctx,
 
                /* release callback */
                if (block->len && shctx->free_block)
-                       shctx->free_block(block, block, shctx->cb_data);
+                       shctx->free_block(block, shctx->cb_data);
                block->len = 0;
 
                if (ret) {

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 3a8f2481dd5a5ce6c81af5ebc70f74bf8cfe31d4..ddc7bce186f2a068397264e71d6323b6ec73b57e 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4206,13 +4206,11 @@ ssl_sock_initial_ctx(struct bind_conf *bind_conf)
 }
 
 
-static inline void sh_ssl_sess_free_blocks(struct shared_block *first, struct shared_block *block, void *data)
+static inline void sh_ssl_sess_free_blocks(struct shared_block *first, void *data)
 {
-       if (first == block) {
-               struct sh_ssl_sess_hdr *sh_ssl_sess = (struct sh_ssl_sess_hdr *)first->data;
-               if (first->len > 0)
-                       sh_ssl_sess_tree_delete(sh_ssl_sess);
-       }
+       struct sh_ssl_sess_hdr *sh_ssl_sess = (struct sh_ssl_sess_hdr *)first->data;
+       if (first->len > 0)
+               sh_ssl_sess_tree_delete(sh_ssl_sess);
 }
 
 /* return first block from sh_ssl_sess  */