drbd: Rename drbd_release_ee() to drbd_free_peer_reqs() (7721f567) · Commits · 戴 / test

drivers/block/drbd/drbd_int.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1455,7 +1455,7 @@ extern int drbd_rs_should_slow_down(struct drbd_conf *mdev, sector_t sector);
		extern int drbd_submit_peer_request(struct drbd_conf *,
		struct drbd_peer_request *, const unsigned,
		const int);
		extern int drbd_release_ee(struct drbd_conf mdev, struct list_head list);
		extern int drbd_free_peer_reqs(struct drbd_conf , struct list_head );
		extern struct drbd_peer_request drbd_alloc_peer_req(struct drbd_conf , u64,
		sector_t, unsigned int,
		gfp_t) __must_hold(local);

+7 −7

Original line number	Diff line number	Diff line
		@@ -2178,27 +2178,27 @@ static struct notifier_block drbd_notifier = {
		.notifier_call = drbd_notify_sys,
		};

		static void drbd_release_ee_lists(struct drbd_conf *mdev)
		static void drbd_release_all_peer_reqs(struct drbd_conf *mdev)
		{
		int rr;

		rr = drbd_release_ee(mdev, &mdev->active_ee);
		rr = drbd_free_peer_reqs(mdev, &mdev->active_ee);
		if (rr)
		dev_err(DEV, "%d EEs in active list found!\n", rr);

		rr = drbd_release_ee(mdev, &mdev->sync_ee);
		rr = drbd_free_peer_reqs(mdev, &mdev->sync_ee);
		if (rr)
		dev_err(DEV, "%d EEs in sync list found!\n", rr);

		rr = drbd_release_ee(mdev, &mdev->read_ee);
		rr = drbd_free_peer_reqs(mdev, &mdev->read_ee);
		if (rr)
		dev_err(DEV, "%d EEs in read list found!\n", rr);

		rr = drbd_release_ee(mdev, &mdev->done_ee);
		rr = drbd_free_peer_reqs(mdev, &mdev->done_ee);
		if (rr)
		dev_err(DEV, "%d EEs in done list found!\n", rr);

		rr = drbd_release_ee(mdev, &mdev->net_ee);
		rr = drbd_free_peer_reqs(mdev, &mdev->net_ee);
		if (rr)
		dev_err(DEV, "%d EEs in net list found!\n", rr);
		}
		@@ -2230,7 +2230,7 @@ void drbd_delete_device(unsigned int minor)

		drbd_free_resources(mdev);

		drbd_release_ee_lists(mdev);
		drbd_release_all_peer_reqs(mdev);

		lc_destroy(mdev->act_log);
		lc_destroy(mdev->resync);

+3 −3

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ You need to hold the req_lock:
		You must not have the req_lock:
		drbd_free_peer_req()
		drbd_alloc_peer_req()
		drbd_release_ee()
		drbd_free_peer_reqs()
		drbd_ee_fix_bhs()
		drbd_process_done_ee()
		drbd_clear_done_ee()
		@@ -373,7 +373,7 @@ void __drbd_free_peer_req(struct drbd_conf mdev, struct drbd_peer_request peer
		mempool_free(peer_req, drbd_ee_mempool);
		}

		int drbd_release_ee(struct drbd_conf mdev, struct list_head list)
		int drbd_free_peer_reqs(struct drbd_conf mdev, struct list_head list)
		{
		LIST_HEAD(work_list);
		struct drbd_peer_request peer_req, t;
		@@ -4175,7 +4175,7 @@ static int drbd_disconnected(int vnr, void p, void data)
		* Actually we don't care for exactly when the network stack does its
		* put_page(), but release our reference on these pages right here.
		*/
		i = drbd_release_ee(mdev, &mdev->net_ee);
		i = drbd_free_peer_reqs(mdev, &mdev->net_ee);
		if (i)
		dev_info(DEV, "net_ee not empty, killed %u entries\n", i);
		i = atomic_read(&mdev->pp_in_use_by_net);