[PATCH] fix compile regression for a few scsi drivers (64821324) · Commits · 戴 / test

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>

drivers/scsi/NCR53C9x.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -2152,29 +2152,23 @@ static int esp_do_data_finale(struct NCR_ESP *esp,
		*/
		static int esp_should_clear_sync(Scsi_Cmnd *sp)
		{
		unchar cmd1 = sp->cmnd[0];
		unchar cmd2 = sp->data_cmnd[0];
		unchar cmd = sp->cmnd[0];

		/* These cases are for spinning up a disk and
		* waiting for that spinup to complete.
		*/
		if(cmd1 == START_STOP \|\|
		cmd2 == START_STOP)
		if(cmd == START_STOP)
		return 0;

		if(cmd1 == TEST_UNIT_READY \|\|
		cmd2 == TEST_UNIT_READY)
		if(cmd == TEST_UNIT_READY)
		return 0;

		/* One more special case for SCSI tape drives,
		* this is what is used to probe the device for
		* completion of a rewind or tape load operation.
		*/
		if(sp->device->type == TYPE_TAPE) {
		if(cmd1 == MODE_SENSE \|\|
		cmd2 == MODE_SENSE)
		if(sp->device->type == TYPE_TAPE && cmd == MODE_SENSE)
		return 0;
		}

		return 1;
		}

drivers/scsi/arm/fas216.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2427,7 +2427,7 @@ int fas216_eh_abort(Scsi_Cmnd *SCpnt)
		info->stats.aborts += 1;

		printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no);
		__scsi_print_command(SCpnt->data_cmnd);
		__scsi_print_command(SCpnt->cmnd);

		print_debug_list();
		fas216_dumpstate(info);

Admin message