Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block

* 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block: (25 commits)
  bsg: Kconfig updates
  bsg: add SCSI transport-level request support
  bsg: add bidi support
  add a struct request pointer to the request structure
  bsg: fix the deadlock on discarding done commands
  bsg: fix a blocking read bug
  bsg: minor bug fixes
  improve bsg device allocation
  bind bsg to all SCSI devices
  bsg: bind bsg to request_queue instead of gendisk
  bsg: add a request_queue argument to scsi_cmd_ioctl()
  bsg: simplify __bsg_alloc_command failpath
  bsg: add cheasy error checks for sysfs stuff
  Add queue resizing support
  Replace s32, u32 and u64 with __s32, __u32 and __u64 in bsg.h for userspace
  bsg: silence a bogus gcc warning
  bsg: style cleanup
  bsg: use u32 etc instead of uint32_t
  bsg: add SG_IO to SG v4
  bsg: replace SG v3 with SG v4
  ...

2 files changed, 21 insertions, 18 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f429be88c4f9..a21f585b1caa 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1258,19 +1258,25 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t
         set_bit(PC_DMA_RECOMMENDED, &pc->flags);
 }
 
-static int
+static void
 idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq)
 {
-        /*
-         * just support eject for now, it would not be hard to make the
-         * REQ_BLOCK_PC support fully-featured
-         */
-        if (rq->cmd[0] != IDEFLOPPY_START_STOP_CMD)
-                return 1;
-
         idefloppy_init_pc(pc);
+        pc->callback = &idefloppy_rw_callback;
         memcpy(pc->c, rq->cmd, sizeof(pc->c));
-        return 0;
+        pc->rq = rq;
+        pc->b_count = rq->data_len;
+        if (rq->data_len && rq_data_dir(rq) == WRITE)
+                set_bit(PC_WRITING, &pc->flags);
+        pc->buffer = rq->data;
+        if (rq->bio)
+                set_bit(PC_DMA_RECOMMENDED, &pc->flags);
+                
+        /*
+         * possibly problematic, doesn't look like ide-floppy correctly
+         * handled scattered requests if dma fails...
+         */
+        pc->request_transfer = pc->buffer_size = rq->data_len;
 }
 
 /*
@@ -1317,10 +1323,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
                 pc = (idefloppy_pc_t *) rq->buffer;
         } else if (blk_pc_request(rq)) {
                 pc = idefloppy_next_pc_storage(drive);
-                if (idefloppy_blockpc_cmd(floppy, pc, rq)) {
-                        idefloppy_do_end_request(drive, 0, 0);
-                        return ide_stopped;
-                }
+                idefloppy_blockpc_cmd(floppy, pc, rq);
         } else {
                 blk_dump_rq_flags(rq,
                         "ide-floppy: unsupported command in queue");
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index c948a5c17a5d..8cd7694593c9 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1049,9 +1049,13 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
         unsigned long flags;
         ide_driver_t *drv;
         void __user *p = (void __user *)arg;
-        int err = 0, (*setfunc)(ide_drive_t *, int);
+        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 HDIO_GET_32BIT:        val = &drive->io_32bit;      goto read_val;
         case HDIO_GET_KEEPSETTINGS: val = &drive->keep_settings; goto read_val;
@@ -1171,10 +1175,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         return 0;
                 }
 
-                case CDROMEJECT:
-                case CDROMCLOSETRAY:
-                        return scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
-
                 case HDIO_GET_BUSSTATE:
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EACCES;