Re: block/bsg.c

[James Bottomley <James.Bottomley@SteelEye.com>]

On Wed, 2007-07-18 at 02:43 +0200, Bartlomiej Zolnierkiewicz wrote:
> [ James, please remeber to cc: linux-ide on IDE patches, thanks. ]

Blame Andrew ... I assumed he'd be reporting the problem to the relevant
lists, so I just did a reply all ...

> On Wednesday 18 July 2007, Jeff Garzik wrote:
> > James Bottomley wrote:
> > > @@ -1052,9 +1054,10 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
> > >  	int err, (*setfunc)(ide_drive_t *, int);
> > >  	u8 *val;
> > >  
> > > -	err = scsi_cmd_ioctl(file, bdev->bd_disk->queue, bdev->bd_disk, cmd, p);
> > > -	if (err != -ENOTTY)
> > > -		return err;
> > > +	switch (cmd) {
> > > +	case SG_IO:
> > > +		return scsi_cmd_ioctl(file, bdev->bd_disk->queue, bdev->bd_disk, cmd, p);
> > > +	}
> > >  
> > >  	switch (cmd) {
> > >  	case HDIO_GET_32BIT:	    val = &drive->io_32bit;	 goto read_val;
> > 
> > 
> > At that point you might as well use an 'if'.
> > 
> > But overall -- agreed.  ACK.
> 
> James/Jeff thanks for following the issue but NAK. ;)
> 
> Causes regression wrt ide-floppy CDROMEJECT/CDROMCLOSETRAY support when
> compared to 2.6.22 and SG_IO is not supported by ide-{disk,scsi,tape}.

Well ... that was why I put the case statement in ... I was sure there
would be other ioctls I missed.

> Luckily Linus has already fixed the issue properly.

Actually, no, that's just a reversion.  I think we need the attached to
complete all of this.

> BTW cmd == 1 IOCTL is not defined/used by IDE driver.

Andrew's trace clearly shows that something is sending cmd == 1 down, so
I'm nearly positive at one time this was a legitimate ioctl for IDE.
Anyway it's probably time to kill this deprecated ioctl in SCSI.

James

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 077fb67..fe65473 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -156,6 +156,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
+#include <scsi/sg.h>
 
 /* default maximum number of failures */
 #define IDE_DEFAULT_MAX_FAILURES 	1
@@ -1173,6 +1174,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
 
 		case CDROMEJECT:
 		case CDROMCLOSETRAY:
+		case SG_IO:
 			return scsi_cmd_ioctl(file, bdev->bd_disk->queue, bdev->bd_disk, cmd, p);
 
 		case HDIO_GET_BUSSTATE:


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/