Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98effe47 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Martin K. Petersen
Browse files

scsi: target: tcmu: Switch to bitmap_zalloc() 



Switch to bitmap_zalloc() to show clearly what we are allocating.  Besides
that it returns pointer of bitmap type instead of opaque void *.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 08b11eac

drivers/target/target_core_user.c

+3 −5
Original line number Diff line number Diff line
@@ -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 @@ static int tcmu_configure_device(struct se_device *dev) 
	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);