UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Gruenbacher 2011-03-31 01:15:34 +02:00 committed by Philipp Reisner
parent 9f5bdc339e
commit da39fec492
3 changed files with 0 additions and 11 deletions

1
drivers/block/drbd/drbd_int.h
View File

@ -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 *integrity_r_tfm; /* to be used by the receiver thread */
struct crypto_hash *csums_tfm; struct crypto_hash *csums_tfm;
struct crypto_hash *verify_tfm; struct crypto_hash *verify_tfm;
void *int_dig_out;
void *int_dig_in; void *int_dig_in;
void *int_dig_vv; void *int_dig_vv;

1
drivers/block/drbd/drbd_main.c
View File

@ -2404,7 +2404,6 @@ void drbd_free_tconn(struct drbd_tconn *tconn)
drbd_free_socket(&tconn->meta); drbd_free_socket(&tconn->meta);
drbd_free_socket(&tconn->data); drbd_free_socket(&tconn->data);
kfree(tconn->name); kfree(tconn->name);
kfree(tconn->int_dig_out);
kfree(tconn->int_dig_in); kfree(tconn->int_dig_in);
kfree(tconn->int_dig_vv); kfree(tconn->int_dig_vv);
kfree(tconn); kfree(tconn);

9
drivers/block/drbd/drbd_nl.c
View File

@ -1781,7 +1781,6 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
struct crypto_hash *tfm = NULL; struct crypto_hash *tfm = NULL;
struct crypto_hash *integrity_w_tfm = NULL; struct crypto_hash *integrity_w_tfm = NULL;
struct crypto_hash *integrity_r_tfm = NULL; struct crypto_hash *integrity_r_tfm = NULL;
void *int_dig_out = NULL;
void *int_dig_in = NULL; void *int_dig_in = NULL;
void *int_dig_vv = NULL; void *int_dig_vv = NULL;
struct drbd_tconn *oconn; 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 */ /* allocation not in the IO path, cqueue thread context */
if (integrity_w_tfm) { if (integrity_w_tfm) {
i = crypto_hash_digestsize(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); int_dig_in = kmalloc(i, GFP_KERNEL);
if (!int_dig_in) { if (!int_dig_in) {
retcode = ERR_NOMEM; 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); crypto_free_hash(tconn->integrity_r_tfm);
tconn->integrity_r_tfm = integrity_r_tfm; tconn->integrity_r_tfm = integrity_r_tfm;
kfree(tconn->int_dig_out);
kfree(tconn->int_dig_in); kfree(tconn->int_dig_in);
kfree(tconn->int_dig_vv); kfree(tconn->int_dig_vv);
tconn->int_dig_out=int_dig_out;
tconn->int_dig_in=int_dig_in; tconn->int_dig_in=int_dig_in;
tconn->int_dig_vv=int_dig_vv; tconn->int_dig_vv=int_dig_vv;
retcode = _conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE); 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; return 0;
fail: fail:
kfree(int_dig_out);
kfree(int_dig_in); kfree(int_dig_in);
kfree(int_dig_vv); kfree(int_dig_vv);
crypto_free_hash(tfm); crypto_free_hash(tfm);