Em Sat, Dec 08, 2007 at 10:06:22AM +0000, Gerrit Renker escreveu:
> This separates RX/TX initialisation and puts all packet history / loss intervals
> initialisation into tfrc.c.
> The organisation is uniform: slab declaration -> {rx,tx}_init() -> {rx,tx}_exit()
NAK, you can't call a __exit marked routine from a __init marked
routine.
- Arnaldo
> Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
> ---
> net/dccp/ccids/lib/packet_history.c | 68 ++++++++++++++++------------------
> net/dccp/ccids/lib/tfrc.c | 31 ++++++++++++----
> 2 files changed, 55 insertions(+), 44 deletions(-)
>
> diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
> index 54cd23e..af0db71 100644
> --- a/net/dccp/ccids/lib/packet_history.c
> +++ b/net/dccp/ccids/lib/packet_history.c
> @@ -57,6 +57,22 @@ struct tfrc_tx_hist_entry {
> */
<SNIP>
> +
> +void __exit tfrc_tx_packet_history_exit(void)
> +{
> + if (tfrc_tx_hist_slab != NULL) {
> + kmem_cache_destroy(tfrc_tx_hist_slab);
> + tfrc_tx_hist_slab = NULL;
> + }
> +}
> +
<SNIP>
> diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c
> index 3a7a183..20763fa 100644
> --- a/net/dccp/ccids/lib/tfrc.c
> +++ b/net/dccp/ccids/lib/tfrc.c
> @@ -14,27 +14,42 @@ module_param(tfrc_debug, bool, 0444);
> MODULE_PARM_DESC(tfrc_debug, "Enable debug messages");
> #endif
>
> +extern int tfrc_tx_packet_history_init(void);
> +extern void tfrc_tx_packet_history_exit(void);
> +extern int tfrc_rx_packet_history_init(void);
> +extern void tfrc_rx_packet_history_exit(void);
> +
> extern int dccp_li_init(void);
> extern void dccp_li_exit(void);
> -extern int packet_history_init(void);
> -extern void packet_history_exit(void);
>
> static int __init tfrc_module_init(void)
> {
> int rc = dccp_li_init();
>
> - if (rc == 0) {
> - rc = packet_history_init();
> - if (rc != 0)
> - dccp_li_exit();
> - }
> + if (rc)
> + goto out;
> +
> + rc = tfrc_tx_packet_history_init();
> + if (rc)
> + goto out_free_loss_intervals;
>
> + rc = tfrc_rx_packet_history_init();
> + if (rc)
> + goto out_free_tx_history;
> + return 0;
> +
> +out_free_tx_history:
> + tfrc_tx_packet_history_exit();
> +out_free_loss_intervals:
> + dccp_li_exit();
> +out:
> return rc;
> }
<SNIP>
-
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
