diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-03-31 01:15:34 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:45:09 +0100 |
| commit | da39fec49286d6b44bf441c9707dda2764b4498a (patch) | |
| tree | ae5e65093283a07f81953ab46f3ff88a46a89266 /drivers/block | |
| parent | 9f5bdc339e3becd85aa8add305d794b0b1ec8996 (diff) | |
| download | linux-stable-da39fec49286d6b44bf441c9707dda2764b4498a.tar.gz linux-stable-da39fec49286d6b44bf441c9707dda2764b4498a.tar.bz2 linux-stable-da39fec49286d6b44bf441c9707dda2764b4498a.zip | |
drbd: Remove now-unused int_dig_out buffer
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 1 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 1 | ||||
| -rw-r--r-- | 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 663f7b611756..ccc374cc7eaa 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 230622f1aae2..e3dc84dcd67e 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2404,7 +2404,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 5cf116471aa3..d9bb1a5c756a 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1781,7 +1781,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; @@ -1955,11 +1954,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; @@ -1990,10 +1984,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); @@ -2009,7 +2001,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); |