1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 396c2fa1ec22..4eeeaaf3796b 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1633,7 +1633,7 @@ static void tcmu_dev_kref_release(struct kref *kref)
         WARN_ON(!all_expired);
 
         tcmu_blocks_release(&udev->data_blocks, 0, udev->dbi_max + 1);
-        kfree(udev->data_bitmap);
+        bitmap_free(udev->data_bitmap);
         mutex_unlock(&udev->cmdr_lock);
 
         call_rcu(&dev->rcu_head, tcmu_dev_call_rcu);
@@ -1841,9 +1841,7 @@ static int tcmu_configure_device(struct se_device *dev)
         info = &udev->uio_info;
 
         mutex_lock(&udev->cmdr_lock);
-        udev->data_bitmap = kcalloc(BITS_TO_LONGS(udev->max_blocks),
-                                    sizeof(unsigned long),
-                                    GFP_KERNEL);
+        udev->data_bitmap = bitmap_zalloc(udev->max_blocks, GFP_KERNEL);
         mutex_unlock(&udev->cmdr_lock);
         if (!udev->data_bitmap) {
                 ret = -ENOMEM;
@@ -1930,7 +1928,7 @@ err_register:
         vfree(udev->mb_addr);
         udev->mb_addr = NULL;
 err_vzalloc:
-        kfree(udev->data_bitmap);
+        bitmap_free(udev->data_bitmap);
         udev->data_bitmap = NULL;
 err_bitmap_alloc:
         kfree(info->name);