lkml.org 
[lkml]   [2011]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] drbd: Remove now-unused int_dig_out buffer
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_int.h | 1 -
    drivers/block/drbd/drbd_main.c | 1 -
    drivers/block/drbd/drbd_nl.c | 9 ---------
    3 files changed, 0 insertions(+), 11 deletions(-)

    diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
    index e5dc772..c58b327 100644
    --- a/drivers/block/drbd/drbd_int.h
    +++ b/drivers/block/drbd/drbd_int.h
    @@ -893,7 +893,6 @@ struct drbd_tconn { /* is a resource from the config file */
    struct crypto_hash *integrity_r_tfm; /* to be used by the receiver thread */
    struct crypto_hash *csums_tfm;
    struct crypto_hash *verify_tfm;
    - void *int_dig_out;
    void *int_dig_in;
    void *int_dig_vv;

    diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
    index 4aec4af..9e94ead 100644
    --- a/drivers/block/drbd/drbd_main.c
    +++ b/drivers/block/drbd/drbd_main.c
    @@ -2380,7 +2380,6 @@ void drbd_free_tconn(struct drbd_tconn *tconn)
    drbd_free_socket(&tconn->meta);
    drbd_free_socket(&tconn->data);
    kfree(tconn->name);
    - kfree(tconn->int_dig_out);
    kfree(tconn->int_dig_in);
    kfree(tconn->int_dig_vv);
    kfree(tconn);
    diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
    index 02d4224..4b60673 100644
    --- a/drivers/block/drbd/drbd_nl.c
    +++ b/drivers/block/drbd/drbd_nl.c
    @@ -1835,7 +1835,6 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
    struct crypto_hash *tfm = NULL;
    struct crypto_hash *integrity_w_tfm = NULL;
    struct crypto_hash *integrity_r_tfm = NULL;
    - void *int_dig_out = NULL;
    void *int_dig_in = NULL;
    void *int_dig_vv = NULL;
    struct drbd_tconn *oconn;
    @@ -2009,11 +2008,6 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
    /* allocation not in the IO path, cqueue thread context */
    if (integrity_w_tfm) {
    i = crypto_hash_digestsize(integrity_w_tfm);
    - int_dig_out = kmalloc(i, GFP_KERNEL);
    - if (!int_dig_out) {
    - retcode = ERR_NOMEM;
    - goto fail;
    - }
    int_dig_in = kmalloc(i, GFP_KERNEL);
    if (!int_dig_in) {
    retcode = ERR_NOMEM;
    @@ -2044,10 +2038,8 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
    crypto_free_hash(tconn->integrity_r_tfm);
    tconn->integrity_r_tfm = integrity_r_tfm;

    - kfree(tconn->int_dig_out);
    kfree(tconn->int_dig_in);
    kfree(tconn->int_dig_vv);
    - tconn->int_dig_out=int_dig_out;
    tconn->int_dig_in=int_dig_in;
    tconn->int_dig_vv=int_dig_vv;
    retcode = _conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE);
    @@ -2063,7 +2055,6 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
    return 0;

    fail:
    - kfree(int_dig_out);
    kfree(int_dig_in);
    kfree(int_dig_vv);
    crypto_free_hash(tfm);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-23 16:35    [W:0.023 / U:66.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site