Commit ba6bee98 authored by Cai Huoqing's avatar Cai Huoqing Committed by Jens Axboe

drbd: Make use of PFN_UP helper macro

it's a refactor to make use of PFN_UP helper macro
Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20220406190715.1938174-5-christoph.boehmwalder@linbit.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e1838cf0
...@@ -683,7 +683,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi ...@@ -683,7 +683,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
} }
} }
want = ALIGN(words*sizeof(long), PAGE_SIZE) >> PAGE_SHIFT; want = PFN_UP(words*sizeof(long));
have = b->bm_number_of_pages; have = b->bm_number_of_pages;
if (want == have) { if (want == have) {
D_ASSERT(device, b->bm_pages != NULL); D_ASSERT(device, b->bm_pages != NULL);
......
...@@ -364,7 +364,7 @@ drbd_alloc_peer_req(struct drbd_peer_device *peer_device, u64 id, sector_t secto ...@@ -364,7 +364,7 @@ drbd_alloc_peer_req(struct drbd_peer_device *peer_device, u64 id, sector_t secto
struct drbd_device *device = peer_device->device; struct drbd_device *device = peer_device->device;
struct drbd_peer_request *peer_req; struct drbd_peer_request *peer_req;
struct page *page = NULL; struct page *page = NULL;
unsigned nr_pages = (payload_size + PAGE_SIZE -1) >> PAGE_SHIFT; unsigned nr_pages = PFN_UP(payload_size);
if (drbd_insert_fault(device, DRBD_FAULT_AL_EE)) if (drbd_insert_fault(device, DRBD_FAULT_AL_EE))
return NULL; return NULL;
...@@ -1630,7 +1630,7 @@ int drbd_submit_peer_request(struct drbd_device *device, ...@@ -1630,7 +1630,7 @@ int drbd_submit_peer_request(struct drbd_device *device,
sector_t sector = peer_req->i.sector; sector_t sector = peer_req->i.sector;
unsigned data_size = peer_req->i.size; unsigned data_size = peer_req->i.size;
unsigned n_bios = 0; unsigned n_bios = 0;
unsigned nr_pages = (data_size + PAGE_SIZE -1) >> PAGE_SHIFT; unsigned nr_pages = PFN_UP(data_size);
/* TRIM/DISCARD: for now, always use the helper function /* TRIM/DISCARD: for now, always use the helper function
* blkdev_issue_zeroout(..., discard=true). * blkdev_issue_zeroout(..., discard=true).
......
...@@ -1030,7 +1030,7 @@ static void move_to_net_ee_or_free(struct drbd_device *device, struct drbd_peer_ ...@@ -1030,7 +1030,7 @@ static void move_to_net_ee_or_free(struct drbd_device *device, struct drbd_peer_
{ {
if (drbd_peer_req_has_active_page(peer_req)) { if (drbd_peer_req_has_active_page(peer_req)) {
/* This might happen if sendpage() has not finished */ /* This might happen if sendpage() has not finished */
int i = (peer_req->i.size + PAGE_SIZE -1) >> PAGE_SHIFT; int i = PFN_UP(peer_req->i.size);
atomic_add(i, &device->pp_in_use_by_net); atomic_add(i, &device->pp_in_use_by_net);
atomic_sub(i, &device->pp_in_use); atomic_sub(i, &device->pp_in_use);
spin_lock_irq(&device->resource->req_lock); spin_lock_irq(&device->resource->req_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment