Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 695b8349 authored by Bart Van Assche's avatar Bart Van Assche Committed by Roland Dreier
Browse files

IB/srp: Test only once whether iu allocation succeeded 



Merge the two tests in srp_queuecommand() of whether information unit
allocation succeeded into one.  An intended side effect of this change
is that we fix the warning:

    drivers/infiniband/ulp/srp/ib_srp.c: In function 'srp_queuecommand':
    drivers/infiniband/ulp/srp/ib_srp.c:1116: warning: 'req' may be used uninitialized in this function

(seen with CONFIG_CC_OPTIMIZE_FOR_SIZE=y at least with gcc 4.4.4)

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarDavid Dillow <dillowda@ornl.gov>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 4162cf64

drivers/infiniband/ulp/srp/ib_srp.c

+7 −8
Original line number Diff line number Diff line
@@ -1132,16 +1132,13 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd) 


	spin_lock_irqsave(&target->lock, flags);

	iu = __srp_get_tx_iu(target, SRP_IU_CMD);

	if (iu) {

		req = list_first_entry(&target->free_reqs, struct srp_request,

				      list);

	if (!iu)

		goto err_unlock;



	req = list_first_entry(&target->free_reqs, struct srp_request, list);

	list_del(&req->list);

	}

	spin_unlock_irqrestore(&target->lock, flags);



	if (!iu)

		goto err;



	dev = target->srp_host->srp_dev->dev;

	ib_dma_sync_single_for_cpu(dev, iu->dma, srp_max_iu_len,

				   DMA_TO_DEVICE);
@@ -1185,6 +1182,8 @@ err_iu: 


	spin_lock_irqsave(&target->lock, flags);

	list_add(&req->list, &target->free_reqs);



err_unlock:

	spin_unlock_irqrestore(&target->lock, flags);



err: