iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB: kmemdup() cleanup

Browse Source 
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:
Eric Sesterhenn 2006-10-23 22:17:21 +02:00 committed by Roland Dreier
parent a1a733f65b
commit bed8bdfddd
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/infiniband/core/cm.c
View File

@ -240,11 +240,10 @@ static void * cm_copy_private_data(const void *private_data,
if (!private_data || !private_data_len) if (!private_data || !private_data_len)
return NULL; return NULL;
data = kmalloc(private_data_len, GFP_KERNEL); data = kmemdup(private_data, private_data_len, GFP_KERNEL);
if (!data) if (!data)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
memcpy(data, private_data, private_data_len);
return data; return data;
} }

3
drivers/infiniband/core/iwcm.c
View File

@ -140,10 +140,9 @@ static int copy_private_data(struct iwcm_id_private *cm_id_priv,
{ {
void *p; void *p;
p = kmalloc(event->private_data_len, GFP_ATOMIC); p = kmemdup(event->private_data, event->private_data_len, GFP_ATOMIC);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
memcpy(p, event->private_data, event->private_data_len);
event->private_data = p; event->private_data = p;
return 0; return 0;
} }

6
drivers/infiniband/core/ucm.c
View File

@ -328,20 +328,18 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,
} }
if (uvt->data_len) { 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) if (!uvt->data)
goto err1; goto err1;
memcpy(uvt->data, evt->private_data, uvt->data_len);
uvt->resp.present |= IB_UCM_PRES_DATA; uvt->resp.present |= IB_UCM_PRES_DATA;
} }
if (uvt->info_len) { if (uvt->info_len) {
uvt->info = kmalloc(uvt->info_len, GFP_KERNEL); uvt->info = kmemdup(info, uvt->info_len, GFP_KERNEL);
if (!uvt->info) if (!uvt->info)
goto err2; goto err2;
memcpy(uvt->info, info, uvt->info_len);
uvt->resp.present |= IB_UCM_PRES_INFO; uvt->resp.present |= IB_UCM_PRES_INFO;
} }
return 0; return 0;

3
drivers/infiniband/hw/mthca/mthca_provider.c
View File

@ -1100,11 +1100,10 @@ static struct ib_fmr *mthca_alloc_fmr(struct ib_pd *pd, int mr_access_flags,
struct mthca_fmr *fmr; struct mthca_fmr *fmr;
int err; int err;
fmr = kmalloc(sizeof *fmr, GFP_KERNEL); fmr = kmemdup(fmr_attr, sizeof *fmr, GFP_KERNEL);
if (!fmr) if (!fmr)
return ERR_PTR(-ENOMEM); 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, err = mthca_fmr_alloc(to_mdev(pd->device), to_mpd(pd)->pd_num,
convert_access(mr_access_flags), fmr); convert_access(mr_access_flags), fmr);