drbd: Remove now-unused int_dig_out buffer (da39fec4) · Commits · 戴 / test

drivers/block/drbd/drbd_int.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);

+0 −9

Original line number	Diff line number	Diff line
		@@ -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);