| Message ID | 20190304094434.57965-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 98effe4746c6e64b76703bbf5fd64e304e3e5396 |
| Headers | show |
| Series | [v1] scsi: tcmu: Switch to bitmap_zalloc() | expand |
On Mon, 2019-03-04 at 11:44 +0200, Andy Shevchenko wrote: > Switch to bitmap_zalloc() to show clearly what we are allocating. > Besides that it returns pointer of bitmap type instead of opaque void *. Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Mike, Please review! > 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/target/target_core_user.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > index 5831e0eecea1..c726c029affe 100644 > --- a/drivers/target/target_core_user.c > +++ b/drivers/target/target_core_user.c > @@ -1663,7 +1663,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); > @@ -1870,9 +1870,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; > @@ -1959,7 +1957,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);
On 03/04/2019 03:44 AM, Andy Shevchenko wrote: > 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/target/target_core_user.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c > index 5831e0eecea1..c726c029affe 100644 > --- a/drivers/target/target_core_user.c > +++ b/drivers/target/target_core_user.c > @@ -1663,7 +1663,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); > @@ -1870,9 +1870,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; > @@ -1959,7 +1957,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); > Looks nice to me. Thanks. Acked-by: Mike Christie <mchristi@redhat.com>
Andy, > Switch to bitmap_zalloc() to show clearly what we are allocating. > Besides that it returns pointer of bitmap type instead of opaque void > *. Applied to 5.1/scsi-queue. Thank you!
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index 5831e0eecea1..c726c029affe 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c @@ -1663,7 +1663,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); @@ -1870,9 +1870,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; @@ -1959,7 +1957,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);
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/target/target_core_user.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)