mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
commit
356d71e00d
926 changed files with 15145 additions and 7580 deletions
|
|
@ -1660,7 +1660,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);
|
||||
|
|
@ -1791,11 +1791,12 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev,
|
|||
|
||||
ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0,
|
||||
TCMU_MCGRP_CONFIG, GFP_KERNEL);
|
||||
/* We don't care if no one is listening */
|
||||
if (ret == -ESRCH)
|
||||
ret = 0;
|
||||
if (!ret)
|
||||
ret = tcmu_wait_genl_cmd_reply(udev);
|
||||
|
||||
/* Wait during an add as the listener may not be up yet */
|
||||
if (ret == 0 ||
|
||||
(ret == -ESRCH && cmd == TCMU_CMD_ADDED_DEVICE))
|
||||
return tcmu_wait_genl_cmd_reply(udev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1867,9 +1868,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;
|
||||
|
|
@ -1956,7 +1955,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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue