From a011a09b954e669e9414665cccd5ada083b13289 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 13 Sep 2010 13:27:10 +0200 Subject: [PATCH] --- yaml --- r: 213146 b: refs/heads/master c: 78db89287ce0f146a1f2a019a0b243ea4557caac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f7bec9420ec..b162e7635823 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a75cc7cfbb98e896232902214432dae30653dfe +refs/heads/master: 78db89287ce0f146a1f2a019a0b243ea4557caac diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index daa672fc46e9..83ba63ab2358 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -915,7 +915,7 @@ static void move_to_net_ee_or_free(struct drbd_conf *mdev, struct drbd_epoch_ent { if (drbd_ee_has_active_page(e)) { /* This might happen if sendpage() has not finished */ - int i = DIV_ROUND_UP(e->size, PAGE_SIZE); + int i = (e->size + PAGE_SIZE -1) >> PAGE_SHIFT; atomic_add(i, &mdev->pp_in_use_by_net); atomic_sub(i, &mdev->pp_in_use); spin_lock_irq(&mdev->req_lock);