Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (76 commits)
  ide: use proper printk() KERN_* levels in ide-probe.c
  ide: fix for EATA SCSI HBA in ATA emulating mode
  ide: remove stale comments from drivers/ide/Makefile
  ide: enable local IRQs in all handlers for TASKFILE_NO_DATA data phase
  ide-scsi: remove kmalloced struct request
  ht6560b: remove old history
  ht6560b: update email address
  ide-cd: fix oops when using growisofs
  gayle: release resources on ide_host_add() failure
  palm_bk3710: add UltraDMA/100 support
  ide: trivial sparse annotations
  ide: ide-tape.c sparse annotations and unaligned access removal
  ide: drop 'name' parameter from ->init_chipset method
  ide: prefix messages from IDE PCI host drivers by driver name
  it821x: remove DECLARE_ITE_DEV() macro
  it8213: remove DECLARE_ITE_DEV() macro
  ide: include PCI device name in messages from IDE PCI host drivers
  ide: remove <asm/ide.h> for some archs
  ide-generic: remove ide_default_{io_base,irq}() inlines (take 3)
  ide-generic: is no longer needed on ppc32
  ...

1 files changed, 22 insertions, 11 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 538552495d48..b40a673985aa 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -101,8 +101,13 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
 
         mutex_lock(&idescsi_ref_mutex);
         scsi = ide_scsi_g(disk);
-        if (scsi)
+        if (scsi) {
                 scsi_host_get(scsi->host);
+                if (ide_device_get(scsi->drive)) {
+                        scsi_host_put(scsi->host);
+                        scsi = NULL;
+                }
+        }
         mutex_unlock(&idescsi_ref_mutex);
         return scsi;
 }
@@ -110,6 +115,7 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
 static void ide_scsi_put(struct ide_scsi_obj *scsi)
 {
         mutex_lock(&idescsi_ref_mutex);
+        ide_device_put(scsi->drive);
         scsi_host_put(scsi->host);
         mutex_unlock(&idescsi_ref_mutex);
 }
@@ -201,15 +207,15 @@ static int idescsi_check_condition(ide_drive_t *drive,
 
         /* stuff a sense request in front of our current request */
         pc = kzalloc(sizeof(struct ide_atapi_pc), GFP_ATOMIC);
-        rq = kmalloc(sizeof(struct request), GFP_ATOMIC);
+        rq = blk_get_request(drive->queue, READ, GFP_ATOMIC);
         buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
         if (!pc || !rq || !buf) {
                 kfree(buf);
-                kfree(rq);
+                if (rq)
+                        blk_put_request(rq);
                 kfree(pc);
                 return -ENOMEM;
         }
-        blk_rq_init(NULL, rq);
         rq->special = (char *) pc;
         pc->rq = rq;
         pc->buf = buf;
@@ -226,6 +232,7 @@ static int idescsi_check_condition(ide_drive_t *drive,
                 ide_scsi_hex_dump(pc->c, 6);
         }
         rq->rq_disk = scsi->disk;
+        rq->ref_count++;
         memcpy(rq->cmd, pc->c, 12);
         ide_do_drive_cmd(drive, rq);
         return 0;
@@ -272,7 +279,7 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
                         SCSI_SENSE_BUFFERSIZE);
                 kfree(pc->buf);
                 kfree(pc);
-                kfree(rq);
+                blk_put_request(rq);
                 pc = opc;
                 rq = pc->rq;
                 pc->scsi_cmd->result = (CHECK_CONDITION << 1) |
@@ -303,7 +310,7 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
         pc->done(pc->scsi_cmd);
         spin_unlock_irqrestore(host->host_lock, flags);
         kfree(pc);
-        kfree(rq);
+        blk_put_request(rq);
         scsi->pc = NULL;
         return 0;
 }
@@ -577,6 +584,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
         ide_drive_t *drive = scsi->drive;
         struct request *rq = NULL;
         struct ide_atapi_pc *pc = NULL;
+        int write = cmd->sc_data_direction == DMA_TO_DEVICE;
 
         if (!drive) {
                 scmd_printk (KERN_ERR, cmd, "drive not present\n");
@@ -584,7 +592,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
         }
         scsi = drive_to_idescsi(drive);
         pc = kmalloc(sizeof(struct ide_atapi_pc), GFP_ATOMIC);
-        rq = kmalloc(sizeof(struct request), GFP_ATOMIC);
+        rq = blk_get_request(drive->queue, write, GFP_ATOMIC);
         if (rq == NULL || pc == NULL) {
                 printk (KERN_ERR "ide-scsi: %s: out of memory\n", drive->name);
                 goto abort;
@@ -614,17 +622,18 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
                 }
         }
 
-        blk_rq_init(NULL, rq);
         rq->special = (char *) pc;
         rq->cmd_type = REQ_TYPE_SPECIAL;
         spin_unlock_irq(host->host_lock);
+        rq->ref_count++;
         memcpy(rq->cmd, pc->c, 12);
         blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL);
         spin_lock_irq(host->host_lock);
         return 0;
 abort:
         kfree (pc);
-        kfree (rq);
+        if (rq)
+                blk_put_request(rq);
         cmd->result = DID_ERROR << 16;
         done(cmd);
         return 0;
@@ -672,7 +681,9 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)
 
                 if (blk_sense_request(scsi->pc->rq))
                         kfree(scsi->pc->buf);
-                kfree(scsi->pc->rq);
+                /* we need to call blk_put_request twice. */
+                blk_put_request(scsi->pc->rq);
+                blk_put_request(scsi->pc->rq);
                 kfree(scsi->pc);
                 scsi->pc = NULL;
 
@@ -724,7 +735,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
                 kfree(scsi->pc->buf);
         kfree(scsi->pc);
         scsi->pc = NULL;
-        kfree(req);
+        blk_put_request(req);
 
         /* now nuke the drive queue */
         while ((req = elv_next_request(drive->queue))) {