From: Fabian Frederick <fabf@skynet.be>
To: linux-kernel@vger.kernel.org
Cc: Philipp Reisner <philipp.reisner@linbit.com>,
Fabian Frederick <fabf@skynet.be>,
Lars Ellenberg <lars.ellenberg@linbit.com>,
drbd-dev@lists.linbit.com
Subject: [PATCH 19/21] drbd: remove bm_vk_free()
Date: Fri, 27 Nov 2015 22:29:34 +0100 [thread overview]
Message-ID: <1448659775-13596-10-git-send-email-fabf@skynet.be> (raw)
In-Reply-To: <1448659775-13596-1-git-send-email-fabf@skynet.be>
Commit 51fa48018a12
("tree wide: use kvfree() than conditional kfree()/vfree()")
simplified bm_vk_free() to one single call.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
drivers/block/drbd/drbd_bitmap.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 17e5e60..36c180f 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -364,11 +364,6 @@ static void bm_free_pages(struct page **pages, unsigned long number)
}
}
-static inline void bm_vk_free(void *ptr)
-{
- kvfree(ptr);
-}
-
/*
* "have" and "want" are NUMBER OF PAGES.
*/
@@ -407,7 +402,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
if (!page) {
bm_free_pages(new_pages + have, i - have);
- bm_vk_free(new_pages);
+ kvfree(new_pages);
return NULL;
}
/* we want to know which page it is
@@ -459,7 +454,7 @@ void drbd_bm_cleanup(struct drbd_device *device)
if (!expect(device->bitmap))
return;
bm_free_pages(device->bitmap->bm_pages, device->bitmap->bm_number_of_pages);
- bm_vk_free(device->bitmap->bm_pages);
+ kvfree(device->bitmap->bm_pages);
kfree(device->bitmap);
device->bitmap = NULL;
}
@@ -659,7 +654,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
b->bm_dev_capacity = 0;
spin_unlock_irq(&b->bm_lock);
bm_free_pages(opages, onpages);
- bm_vk_free(opages);
+ kvfree(opages);
goto out;
}
bits = BM_SECT_TO_BIT(ALIGN(capacity, BM_SECT_PER_BIT));
@@ -732,7 +727,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
spin_unlock_irq(&b->bm_lock);
if (opages != npages)
- bm_vk_free(opages);
+ kvfree(opages);
if (!growing)
b->bm_set = bm_count_bits(b);
drbd_info(device, "resync bitmap: bits=%lu words=%lu pages=%lu\n", bits, words, want);
--
2.1.4
next prev parent reply other threads:[~2015-11-27 21:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 21:26 [PATCH 00/21] drbd: clean-up patchset Fabian Frederick
2015-11-27 21:26 ` [PATCH 01/21] drbd: debugfs: constify drbd_version_fops Fabian Frederick
2015-11-27 21:26 ` [PATCH 02/21] drbd: simplify drbd_md_set_sector_offsets() Fabian Frederick
2015-11-27 21:26 ` [PATCH 03/21] drbd: use seq_put instead of seq_print where possible Fabian Frederick
2015-11-27 21:26 ` [PATCH 04/21] drbd: include linux/uaccess.h instead of asm/uaccess.h Fabian Frederick
2015-11-27 21:26 ` [PATCH 05/21] drbd: rework is_valid_state() Fabian Frederick
2015-11-27 21:26 ` [PATCH 06/21] drbd: use const char * const for drbd strings Fabian Frederick
2015-11-27 21:26 ` [PATCH 07/21] drbd: kerneldoc warning fix in w_e_end_data_req() Fabian Frederick
2015-11-27 21:26 ` [PATCH 08/21] drbd: use unsigned for one bit fields Fabian Frederick
2015-11-27 21:26 ` [PATCH 09/21] drbd: use bool for peer is_ states Fabian Frederick
2015-11-27 21:29 ` [PATCH 10/21] drbd: fix typo Fabian Frederick
2015-11-27 21:29 ` [PATCH 11/21] drbd: use | for bitmask combination Fabian Frederick
2015-11-27 21:29 ` [PATCH 12/21] drbd: use true/false for bool Fabian Frederick
2015-11-27 21:29 ` [PATCH 13/21] drbd: fix drbd_bm_init() comments Fabian Frederick
2015-11-27 21:29 ` [PATCH 14/21] drbd: clean-up receive_SyncParam() Fabian Frederick
2015-11-27 21:29 ` [PATCH 15/21] drbd: introduce peer state union Fabian Frederick
2015-11-27 21:29 ` [PATCH 16/21] drbd: fix maybe_pull_ahead() locking comments Fabian Frederick
2015-11-27 21:29 ` [PATCH 17/21] drbd: use bool for growing Fabian Frederick
2015-11-27 21:29 ` [PATCH 18/21] drbd: remove redundant declarations Fabian Frederick
2015-11-27 21:29 ` Fabian Frederick [this message]
2015-11-27 21:30 ` [PATCH 20/21] drbd: remove unused definitions Fabian Frederick
2015-11-27 21:30 ` [PATCH 21/21] drbd: replace if/BUG by BUG_ON Fabian Frederick
2015-12-01 8:55 ` [Drbd-dev] [PATCH 00/21] drbd: clean-up patchset Philipp Reisner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448659775-13596-10-git-send-email-fabf@skynet.be \
--to=fabf@skynet.be \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®