[PATCH] fix compile regression for a few scsi drivers

This fixes three drivers to compile again after my patch that removes
the data_cmnd member from struct scsi_cmnd.

The fas216 change is trivial, it should have been using ->cmnd all the
time.

NCR53C9 (which seem to be mostly duplicate driver with esp.c!) is doing
something odd, it should only have looked at ->cmnd before not the saved
copy that is kept for the error handlers sake. Note that it really
should deal with the sync setting themselves but use the generic domain
validation code that get this right - but that's for later let's push
this simple compile fix for now.

And sorry for the late fix for this, I have been busy with OLS and
associated activities last week.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Christoph Hellwig and committed by Linus Torvalds 64821324 dab5025c

+6 -12
+5 -11
drivers/scsi/NCR53C9x.c
··· 2152 */ 2153 static int esp_should_clear_sync(Scsi_Cmnd *sp) 2154 { 2155 - unchar cmd1 = sp->cmnd[0]; 2156 - unchar cmd2 = sp->data_cmnd[0]; 2157 2158 /* These cases are for spinning up a disk and 2159 * waiting for that spinup to complete. 2160 */ 2161 - if(cmd1 == START_STOP || 2162 - cmd2 == START_STOP) 2163 return 0; 2164 2165 - if(cmd1 == TEST_UNIT_READY || 2166 - cmd2 == TEST_UNIT_READY) 2167 return 0; 2168 2169 /* One more special case for SCSI tape drives, 2170 * this is what is used to probe the device for 2171 * completion of a rewind or tape load operation. 2172 */ 2173 - if(sp->device->type == TYPE_TAPE) { 2174 - if(cmd1 == MODE_SENSE || 2175 - cmd2 == MODE_SENSE) 2176 - return 0; 2177 - } 2178 2179 return 1; 2180 }
··· 2152 */ 2153 static int esp_should_clear_sync(Scsi_Cmnd *sp) 2154 { 2155 + unchar cmd = sp->cmnd[0]; 2156 2157 /* These cases are for spinning up a disk and 2158 * waiting for that spinup to complete. 2159 */ 2160 + if(cmd == START_STOP) 2161 return 0; 2162 2163 + if(cmd == TEST_UNIT_READY) 2164 return 0; 2165 2166 /* One more special case for SCSI tape drives, 2167 * this is what is used to probe the device for 2168 * completion of a rewind or tape load operation. 2169 */ 2170 + if(sp->device->type == TYPE_TAPE && cmd == MODE_SENSE) 2171 + return 0; 2172 2173 return 1; 2174 }
+1 -1
drivers/scsi/arm/fas216.c
··· 2427 info->stats.aborts += 1; 2428 2429 printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no); 2430 - __scsi_print_command(SCpnt->data_cmnd); 2431 2432 print_debug_list(); 2433 fas216_dumpstate(info);
··· 2427 info->stats.aborts += 1; 2428 2429 printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no); 2430 + __scsi_print_command(SCpnt->cmnd); 2431 2432 print_debug_list(); 2433 fas216_dumpstate(info);