Commit 1d041225 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Eliminated drbd_free_resoruces() it is superseeded by conn_free_crypto() 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent f5e2b8b3

drivers/block/drbd/drbd_int.h

+0 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,6 @@ extern void drbd_calc_cpu_mask(struct drbd_tconn *tconn); 
#define drbd_thread_current_set_cpu(A) ({})

#define drbd_calc_cpu_mask(A) ({})

#endif

extern void drbd_free_resources(struct drbd_conf *mdev);

extern void tl_release(struct drbd_tconn *, unsigned int barrier_nr,

		       unsigned int set_size);

extern void tl_clear(struct drbd_tconn *);

drivers/block/drbd/drbd_main.c

+12 −23
Original line number Diff line number Diff line
@@ -2057,7 +2057,9 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev) 
		drbd_bm_cleanup(mdev);

	}



	drbd_free_resources(mdev);

	drbd_free_bc(mdev->ldev);

	mdev->ldev = NULL;



	clear_bit(AL_SUSPENDED, &mdev->flags);



	D_ASSERT(list_empty(&mdev->active_ee));
@@ -2252,7 +2254,8 @@ void drbd_delete_device(struct drbd_conf *mdev) 
	if (mdev->this_bdev)

		bdput(mdev->this_bdev);



	drbd_free_resources(mdev);

	drbd_free_bc(mdev->ldev);

	mdev->ldev = NULL;



	drbd_release_all_peer_reqs(mdev);
@@ -2387,11 +2390,18 @@ static void drbd_free_socket(struct drbd_socket *socket) 


void conn_free_crypto(struct drbd_tconn *tconn)

{

	drbd_free_sock(tconn);



	crypto_free_hash(tconn->csums_tfm);

	crypto_free_hash(tconn->verify_tfm);

	crypto_free_hash(tconn->cram_hmac_tfm);

	crypto_free_hash(tconn->integrity_w_tfm);

	crypto_free_hash(tconn->integrity_r_tfm);

	kfree(tconn->int_dig_in);

	kfree(tconn->int_dig_vv);



	tconn->csums_tfm = NULL;

	tconn->verify_tfm = NULL;

	tconn->cram_hmac_tfm = NULL;

	tconn->integrity_w_tfm = NULL;

	tconn->integrity_r_tfm = NULL;
@@ -2700,27 +2710,6 @@ void drbd_free_sock(struct drbd_tconn *tconn) 
	}

}





void drbd_free_resources(struct drbd_conf *mdev)

{

	crypto_free_hash(mdev->tconn->csums_tfm);

	mdev->tconn->csums_tfm = NULL;

	crypto_free_hash(mdev->tconn->verify_tfm);

	mdev->tconn->verify_tfm = NULL;

	crypto_free_hash(mdev->tconn->cram_hmac_tfm);

	mdev->tconn->cram_hmac_tfm = NULL;

	crypto_free_hash(mdev->tconn->integrity_w_tfm);

	mdev->tconn->integrity_w_tfm = NULL;

	crypto_free_hash(mdev->tconn->integrity_r_tfm);

	mdev->tconn->integrity_r_tfm = NULL;



	drbd_free_sock(mdev->tconn);



	__no_warn(local,

		  drbd_free_bc(mdev->ldev);

		  mdev->ldev = NULL;);

}



/* meta data management */



struct meta_data_on_disk {