adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 13:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

ieee1394: sbp2: some conditions in queue_command are unlikely

Browse source 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2006-11-02 21:16:08 +01:00
parent e8ca5668f1
commit 5796aa7b11
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/ieee1394/sbp2.c
View file

@ -1910,12 +1910,12 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
struct sbp2scsi_host_info *hi; struct sbp2scsi_host_info *hi;
int result = DID_NO_CONNECT << 16; int result = DID_NO_CONNECT << 16;
if (!sbp2util_node_is_available(scsi_id)) if (unlikely(!sbp2util_node_is_available(scsi_id)))
goto done; goto done;
hi = scsi_id->hi; hi = scsi_id->hi;
if (!hi) { if (unlikely(!hi)) {
SBP2_ERR("sbp2scsi_host_info is NULL - this is bad!"); SBP2_ERR("sbp2scsi_host_info is NULL - this is bad!");
goto done; goto done;
} }
@ -1923,7 +1923,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
/* Multiple units are currently represented to the SCSI core as separate /* Multiple units are currently represented to the SCSI core as separate
* targets, not as one target with multiple LUs. Therefore return * targets, not as one target with multiple LUs. Therefore return
* selection time-out to any IO directed at non-zero LUNs. */ * selection time-out to any IO directed at non-zero LUNs. */
if (SCpnt->device->lun) if (unlikely(SCpnt->device->lun))
goto done; goto done;
/* handle the request sense command here (auto-request sense) */ /* handle the request sense command here (auto-request sense) */
@ -1934,7 +1934,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
return 0; return 0;
} }
if (!hpsb_node_entry_valid(scsi_id->ne)) { if (unlikely(!hpsb_node_entry_valid(scsi_id->ne))) {
SBP2_ERR("Bus reset in progress - rejecting command"); SBP2_ERR("Bus reset in progress - rejecting command");
result = DID_BUS_BUSY << 16; result = DID_BUS_BUSY << 16;
goto done; goto done;
@ -1942,7 +1942,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
/* Bidirectional commands are not yet implemented, /* Bidirectional commands are not yet implemented,
* and unknown transfer direction not handled. */ * and unknown transfer direction not handled. */
if (SCpnt->sc_data_direction == DMA_BIDIRECTIONAL) { if (unlikely(SCpnt->sc_data_direction == DMA_BIDIRECTIONAL)) {
SBP2_ERR("Cannot handle DMA_BIDIRECTIONAL - rejecting command"); SBP2_ERR("Cannot handle DMA_BIDIRECTIONAL - rejecting command");
result = DID_ERROR << 16; result = DID_ERROR << 16;
goto done; goto done;