From: Andreas Gruenbacher Date: Thu, 7 Apr 2011 19:02:59 +0000 (+0200) Subject: drbd: Rename drbd_pp_free() to drbd_free_pages() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cc287e0ae77bef615a046a44e17e1d68e23dbb7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drbd: Rename drbd_pp_free() to drbd_free_pages() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 74995e24dc1b..7e635b24eef7 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -283,7 +283,7 @@ struct page *drbd_alloc_pages(struct drbd_conf *mdev, unsigned int number, * Is also used from inside an other spin_lock_irq(&mdev->tconn->req_lock); * Either links the page chain back to the global pool, * or returns all pages to the system. */ -static void drbd_pp_free(struct drbd_conf *mdev, struct page *page, int is_net) +static void drbd_free_pages(struct drbd_conf *mdev, struct page *page, int is_net) { atomic_t *a = is_net ? &mdev->pp_in_use_by_net : &mdev->pp_in_use; int i; @@ -370,7 +370,7 @@ void __drbd_free_peer_req(struct drbd_conf *mdev, struct drbd_peer_request *peer { if (peer_req->flags & EE_HAS_DIGEST) kfree(peer_req->digest); - drbd_pp_free(mdev, peer_req->pages, is_net); + drbd_free_pages(mdev, peer_req->pages, is_net); D_ASSERT(atomic_read(&peer_req->pending_bios) == 0); D_ASSERT(drbd_interval_empty(&peer_req->i)); mempool_free(peer_req, drbd_ee_mempool); @@ -1438,7 +1438,7 @@ static int drbd_drain_block(struct drbd_conf *mdev, int data_size) data_size -= len; } kunmap(page); - drbd_pp_free(mdev, page, 0); + drbd_free_pages(mdev, page, 0); return err; }