From 18c2d52249fff156ff2db2e18cefe5184078af72 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 7 Apr 2011 21:08:50 +0200 Subject: [PATCH] drbd: Rename drbd_pp_first_pages_or_try_alloc() to __drbd_alloc_pages() Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_receiver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 3f68404a17e8..68914a0d3538 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -150,11 +150,12 @@ static void page_chain_add(struct page **head, *head = chain_first; } -static struct page *drbd_pp_first_pages_or_try_alloc(struct drbd_conf *mdev, int number) +static struct page *__drbd_alloc_pages(struct drbd_conf *mdev, + unsigned int number) { struct page *page = NULL; struct page *tmp = NULL; - int i = 0; + unsigned int i = 0; /* Yes, testing drbd_pp_vacant outside the lock is racy. * So what. It saves a spin_lock. */ @@ -247,7 +248,7 @@ static struct page *drbd_pp_alloc(struct drbd_conf *mdev, unsigned number, bool /* Yes, we may run up to @number over max_buffers. If we * follow it strictly, the admin will get it wrong anyways. */ if (atomic_read(&mdev->pp_in_use) < mdev->tconn->net_conf->max_buffers) - page = drbd_pp_first_pages_or_try_alloc(mdev, number); + page = __drbd_alloc_pages(mdev, number); while (page == NULL) { prepare_to_wait(&drbd_pp_wait, &wait, TASK_INTERRUPTIBLE); @@ -255,7 +256,7 @@ static struct page *drbd_pp_alloc(struct drbd_conf *mdev, unsigned number, bool drbd_kick_lo_and_reclaim_net(mdev); if (atomic_read(&mdev->pp_in_use) < mdev->tconn->net_conf->max_buffers) { - page = drbd_pp_first_pages_or_try_alloc(mdev, number); + page = __drbd_alloc_pages(mdev, number); if (page) break; } -- 2.20.1