summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-09-13 13:27:10 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 18:38:39 +0200
commit78db89287ce0f146a1f2a019a0b243ea4557caac (patch)
tree2617438befb8ade666103f40f009e89f184464bc /drivers/block
parentdrbd: Fixed compatibility with protocol versions smaller than 95 (diff)
downloadlinux-78db89287ce0f146a1f2a019a0b243ea4557caac.tar.xz
linux-78db89287ce0f146a1f2a019a0b243ea4557caac.zip
drbd: DIV_ROUND_UP not needed here
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_worker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index daa672fc46e9..83ba63ab2358 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/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);