From 94732cdd335fd91e96c642598522266171556fa5 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 7 Apr 2011 21:08:50 +0200 Subject: [PATCH] --- yaml --- r: 345999 b: refs/heads/master c: 18c2d52249fff156ff2db2e18cefe5184078af72 h: refs/heads/master i: 345997: 5067af27313b2b6e8aec2789f5cfaf7babe64e17 345995: eca110b4283c919aa63a7955be8ad7a97bee9268 345991: 27b0e8bcb57d6ae594ef888bf2d26018d61eca16 345983: 0fa6f10a9a0cc8ca981b7491a4b87cc5fe6dde90 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 320a66d4677f..fedb55710c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4da15374ba52009801d4c37c6dae0ba6ec0fca5 +refs/heads/master: 18c2d52249fff156ff2db2e18cefe5184078af72 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 3f68404a17e8..68914a0d3538 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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; }