On Mon, Mar 15, 2010 at 11:23:32AM +0300, Dan Carpenter wrote: > "ret" is initialized to -ENOMEM so we don't need to set it here. > > Signed-off-by: Dan Carpenter <[email protected]> > > diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c > b/drivers/infiniband/ulp/iser/iser_verbs.c > index 308d17b..8fa6997 100644 > --- a/drivers/infiniband/ulp/iser/iser_verbs.c > +++ b/drivers/infiniband/ulp/iser/iser_verbs.c > @@ -148,10 +148,8 @@ static int iser_create_ib_conn_res(struct iser_conn > *ib_conn) > device = ib_conn->device; > > ib_conn->login_buf = kmalloc(ISER_RX_LOGIN_SIZE, GFP_KERNEL); > - if (!ib_conn->login_buf) { > + if (!ib_conn->login_buf) > goto alloc_err; > - ret = -ENOMEM; > - } > > ib_conn->login_dma = ib_dma_map_single(ib_conn->device->ib_device, > (void *)ib_conn->login_buf, ISER_RX_LOGIN_SIZE, > @@ -160,10 +158,9 @@ static int iser_create_ib_conn_res(struct iser_conn > *ib_conn) > ib_conn->page_vec = kmalloc(sizeof(struct iser_page_vec) + > (sizeof(u64) * (ISCSI_ISER_SG_TABLESIZE > +1)), > GFP_KERNEL); > - if (!ib_conn->page_vec) { > - ret = -ENOMEM; > + if (!ib_conn->page_vec) > goto alloc_err; > - } > + > ib_conn->page_vec->pages = (u64 *) (ib_conn->page_vec + 1); > > params.page_shift = SHIFT_4K;
If there's a failure while allocating page_vec, login_buf will not be released. A single extra label should solve this. Regards, Cascardo.
signature.asc
Description: Digital signature
