Commit d628769b authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Move drbd_free_tl_hash() to drbd_main() 



This is the only place where this function is used.  Make it static.

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

drivers/block/drbd/drbd_int.h

+0 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,6 @@ extern void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, 
extern void drbd_set_recv_tcq(struct drbd_conf *mdev, int tcq_enabled);

extern void _drbd_clear_done_ee(struct drbd_conf *mdev, struct list_head *to_be_freed);

extern void drbd_flush_workqueue(struct drbd_conf *mdev);

extern void drbd_free_tl_hash(struct drbd_conf *mdev);



/* yes, there is kernel_setsockopt, but only since 2.6.18. we don't need to

 * mess with get_fs/set_fs, we know we are KERNEL_DS always. */

drivers/block/drbd/drbd_main.c

+30 −0
Original line number Diff line number Diff line
@@ -228,6 +228,36 @@ static void tl_cleanup(struct drbd_conf *mdev) 
	mdev->tl_hash_s = 0;

}



static void drbd_free_tl_hash(struct drbd_conf *mdev)

{

	struct hlist_head *h;



	spin_lock_irq(&mdev->req_lock);



	if (!mdev->tl_hash || mdev->state.conn != C_STANDALONE) {

		spin_unlock_irq(&mdev->req_lock);

		return;

	}

	/* paranoia code */

	for (h = mdev->ee_hash; h < mdev->ee_hash + mdev->ee_hash_s; h++)

		if (h->first)

			dev_err(DEV, "ASSERT FAILED ee_hash[%u].first == %p, expected NULL\n",

				(int)(h - mdev->ee_hash), h->first);

	kfree(mdev->ee_hash);

	mdev->ee_hash = NULL;

	mdev->ee_hash_s = 0;



	/* paranoia code */

	for (h = mdev->tl_hash; h < mdev->tl_hash + mdev->tl_hash_s; h++)

		if (h->first)

			dev_err(DEV, "ASSERT FAILED tl_hash[%u] == %p, expected NULL\n",

				(int)(h - mdev->tl_hash), h->first);

	kfree(mdev->tl_hash);

	mdev->tl_hash = NULL;

	mdev->tl_hash_s = 0;

	spin_unlock_irq(&mdev->req_lock);

}



/**

 * _tl_add_barrier() - Adds a barrier to the transfer log

 * @mdev:	DRBD device.

drivers/block/drbd/drbd_receiver.c

+0 −30
Original line number Diff line number Diff line
@@ -3740,36 +3740,6 @@ void drbd_flush_workqueue(struct drbd_conf *mdev) 
	wait_for_completion(&barr.done);

}



void drbd_free_tl_hash(struct drbd_conf *mdev)

{

	struct hlist_head *h;



	spin_lock_irq(&mdev->req_lock);



	if (!mdev->tl_hash || mdev->state.conn != C_STANDALONE) {

		spin_unlock_irq(&mdev->req_lock);

		return;

	}

	/* paranoia code */

	for (h = mdev->ee_hash; h < mdev->ee_hash + mdev->ee_hash_s; h++)

		if (h->first)

			dev_err(DEV, "ASSERT FAILED ee_hash[%u].first == %p, expected NULL\n",

				(int)(h - mdev->ee_hash), h->first);

	kfree(mdev->ee_hash);

	mdev->ee_hash = NULL;

	mdev->ee_hash_s = 0;



	/* paranoia code */

	for (h = mdev->tl_hash; h < mdev->tl_hash + mdev->tl_hash_s; h++)

		if (h->first)

			dev_err(DEV, "ASSERT FAILED tl_hash[%u] == %p, expected NULL\n",

				(int)(h - mdev->tl_hash), h->first);

	kfree(mdev->tl_hash);

	mdev->tl_hash = NULL;

	mdev->tl_hash_s = 0;

	spin_unlock_irq(&mdev->req_lock);

}



static void drbd_disconnect(struct drbd_conf *mdev)

{

	enum drbd_fencing_p fp;