mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 06:02:38 +00:00
IB: kmemdup() cleanup
Replace open coded kmemdup() to save some screen space, and allow inlining/not inlining to be triggered by gcc. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
a1a733f65b
commit
bed8bdfddd
@ -240,11 +240,10 @@ static void * cm_copy_private_data(const void *private_data,
|
||||
if (!private_data || !private_data_len)
|
||||
return NULL;
|
||||
|
||||
data = kmalloc(private_data_len, GFP_KERNEL);
|
||||
data = kmemdup(private_data, private_data_len, GFP_KERNEL);
|
||||
if (!data)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
memcpy(data, private_data, private_data_len);
|
||||
return data;
|
||||
}
|
||||
|
||||
|
@ -140,10 +140,9 @@ static int copy_private_data(struct iwcm_id_private *cm_id_priv,
|
||||
{
|
||||
void *p;
|
||||
|
||||
p = kmalloc(event->private_data_len, GFP_ATOMIC);
|
||||
p = kmemdup(event->private_data, event->private_data_len, GFP_ATOMIC);
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
memcpy(p, event->private_data, event->private_data_len);
|
||||
event->private_data = p;
|
||||
return 0;
|
||||
}
|
||||
|
@ -328,20 +328,18 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,
|
||||
}
|
||||
|
||||
if (uvt->data_len) {
|
||||
uvt->data = kmalloc(uvt->data_len, GFP_KERNEL);
|
||||
uvt->data = kmemdup(evt->private_data, uvt->data_len, GFP_KERNEL);
|
||||
if (!uvt->data)
|
||||
goto err1;
|
||||
|
||||
memcpy(uvt->data, evt->private_data, uvt->data_len);
|
||||
uvt->resp.present |= IB_UCM_PRES_DATA;
|
||||
}
|
||||
|
||||
if (uvt->info_len) {
|
||||
uvt->info = kmalloc(uvt->info_len, GFP_KERNEL);
|
||||
uvt->info = kmemdup(info, uvt->info_len, GFP_KERNEL);
|
||||
if (!uvt->info)
|
||||
goto err2;
|
||||
|
||||
memcpy(uvt->info, info, uvt->info_len);
|
||||
uvt->resp.present |= IB_UCM_PRES_INFO;
|
||||
}
|
||||
return 0;
|
||||
|
@ -1100,11 +1100,10 @@ static struct ib_fmr *mthca_alloc_fmr(struct ib_pd *pd, int mr_access_flags,
|
||||
struct mthca_fmr *fmr;
|
||||
int err;
|
||||
|
||||
fmr = kmalloc(sizeof *fmr, GFP_KERNEL);
|
||||
fmr = kmemdup(fmr_attr, sizeof *fmr, GFP_KERNEL);
|
||||
if (!fmr)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
memcpy(&fmr->attr, fmr_attr, sizeof *fmr_attr);
|
||||
err = mthca_fmr_alloc(to_mdev(pd->device), to_mpd(pd)->pd_num,
|
||||
convert_access(mr_access_flags), fmr);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user