8 files changed, 70 insertions, 47 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index d31117eb95aa..e4d55ad32d2f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block)
         if (cdrom_read_from_buffer(drive))
                 return ide_stopped;
 
-        blk_attempt_remerge(drive->queue, rq);
-
         /* Clear the local sector buffer. */
         info->nsectors_buffered = 0;
 
@@ -1874,14 +1872,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq)
                 return ide_stopped;
         }
 
-        /*
-         * for dvd-ram and such media, it's a really big deal to get
-         * big writes all the time. so scour the queue and attempt to
-         * remerge requests, often the plugging will not have had time
-         * to do this properly
-         */
-        blk_attempt_remerge(drive->queue, rq);
-
         info->nsectors_buffered = 0;
 
         /* use dma, if possible. we don't need to check more, since we
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 4b441720b6ba..cab362ea0336 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1130,6 +1130,17 @@ static int idedisk_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
+static int idedisk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+        struct ide_disk_obj *idkp = ide_disk_g(bdev->bd_disk);
+        ide_drive_t *drive = idkp->drive;
+
+        geo->heads = drive->bios_head;
+        geo->sectors = drive->bios_sect;
+        geo->cylinders = (u16)drive->bios_cyl; /* truncate */
+        return 0;
+}
+
 static int idedisk_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
@@ -1164,6 +1175,7 @@ static struct block_device_operations idedisk_ops = {
         .open           = idedisk_open,
         .release        = idedisk_release,
         .ioctl          = idedisk_ioctl,
+        .getgeo         = idedisk_getgeo,
         .media_changed  = idedisk_media_changed,
         .revalidate_disk= idedisk_revalidate_disk
 };
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index fba3fffc2d66..5945f551aaaa 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -2031,6 +2031,17 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
+static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+        struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
+        ide_drive_t *drive = floppy->drive;
+
+        geo->heads = drive->bios_head;
+        geo->sectors = drive->bios_sect;
+        geo->cylinders = (u16)drive->bios_cyl; /* truncate */
+        return 0;
+}
+
 static int idefloppy_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
@@ -2120,6 +2131,7 @@ static struct block_device_operations idefloppy_ops = {
         .open           = idefloppy_open,
         .release        = idefloppy_release,
         .ioctl          = idefloppy_ioctl,
+        .getgeo         = idefloppy_getgeo,
         .media_changed  = idefloppy_media_changed,
         .revalidate_disk= idefloppy_revalidate_disk
 };
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index b5dc6df8e67d..dea2d4dcc698 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -55,9 +55,22 @@
 #include <asm/io.h>
 #include <asm/bitops.h>
 
+void ide_softirq_done(struct request *rq)
+{
+        request_queue_t *q = rq->q;
+
+        add_disk_randomness(rq->rq_disk);
+        end_that_request_chunk(rq, rq->errors, rq->data_len);
+
+        spin_lock_irq(q->queue_lock);
+        end_that_request_last(rq, rq->errors);
+        spin_unlock_irq(q->queue_lock);
+}
+
 int __ide_end_request(ide_drive_t *drive, struct request *rq, int uptodate,
                       int nr_sectors)
 {
+        unsigned int nbytes;
         int ret = 1;
 
         BUG_ON(!(rq->flags & REQ_STARTED));
@@ -81,17 +94,28 @@ int __ide_end_request(ide_drive_t *drive, struct request *rq, int uptodate,
                 HWGROUP(drive)->hwif->ide_dma_on(drive);
         }
 
-        if (!end_that_request_first(rq, uptodate, nr_sectors)) {
-                add_disk_randomness(rq->rq_disk);
-
-                if (blk_rq_tagged(rq))
-                        blk_queue_end_tag(drive->queue, rq);
-
+        /*
+         * For partial completions (or non fs/pc requests), use the regular
+         * direct completion path.
+         */
+        nbytes = nr_sectors << 9;
+        if (rq_all_done(rq, nbytes)) {
+                rq->errors = uptodate;
+                rq->data_len = nbytes;
                 blkdev_dequeue_request(rq);
                 HWGROUP(drive)->rq = NULL;
-                end_that_request_last(rq, uptodate);
+                blk_complete_request(rq);
                 ret = 0;
+        } else {
+                if (!end_that_request_first(rq, uptodate, nr_sectors)) {
+                        add_disk_randomness(rq->rq_disk);
+                        blkdev_dequeue_request(rq);
+                        HWGROUP(drive)->rq = NULL;
+                        end_that_request_last(rq, uptodate);
+                        ret = 0;
+                }
         }
+
         return ret;
 }
 EXPORT_SYMBOL(__ide_end_request);
@@ -113,6 +137,10 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
         unsigned long flags;
         int ret = 1;
 
+        /*
+         * room for locking improvements here, the calls below don't
+         * need the queue lock held at all
+         */
         spin_lock_irqsave(&ide_lock, flags);
         rq = HWGROUP(drive)->rq;
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 02167a5b751d..1ddaa71a8f45 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1011,6 +1011,8 @@ static int ide_init_queue(ide_drive_t *drive)
         blk_queue_max_hw_segments(q, max_sg_entries);
         blk_queue_max_phys_segments(q, max_sg_entries);
 
+        blk_queue_softirq_done(q, ide_softirq_done);
+
         /* assign drive queue */
         drive->queue = q;
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 4b524f6b3ecd..b069b13b75a7 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1278,19 +1278,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
         up(&ide_setting_sem);
 
         switch (cmd) {
-                case HDIO_GETGEO:
-                {
-                        struct hd_geometry geom;
-                        if (!p || (drive->media != ide_disk && drive->media != ide_floppy)) return -EINVAL;
-                        geom.heads = drive->bios_head;
-                        geom.sectors = drive->bios_sect;
-                        geom.cylinders = (u16)drive->bios_cyl; /* truncate */
-                        geom.start = get_start_sect(bdev);
-                        if (copy_to_user(p, &geom, sizeof(struct hd_geometry)))
-                                return -EFAULT;
-                        return 0;
-                }
-
                 case HDIO_OBSOLETE_IDENTITY:
                 case HDIO_GET_IDENTITY:
                         if (bdev != bdev->bd_contains)
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index 242029c9c0ca..6439dec66881 100644
--- a/drivers/ide/legacy/hd.c
+++ b/drivers/ide/legacy/hd.c
@@ -658,22 +658,14 @@ static void do_hd_request (request_queue_t * q)
         enable_irq(HD_IRQ);
 }
 
-static int hd_ioctl(struct inode * inode, struct file * file,
-        unsigned int cmd, unsigned long arg)
+static int hd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
-        struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
-        struct hd_geometry __user *loc = (struct hd_geometry __user *) arg;
-        struct hd_geometry g; 
-
-        if (cmd != HDIO_GETGEO)
-                return -EINVAL;
-        if (!loc)
-                return -EINVAL;
-        g.heads = disk->head;
-        g.sectors = disk->sect;
-        g.cylinders = disk->cyl;
-        g.start = get_start_sect(inode->i_bdev);
-        return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+        struct hd_i_struct *disk = bdev->bd_disk->private_data;
+
+        geo->heads = disk->head;
+        geo->sectors = disk->sect;
+        geo->cylinders = disk->cyl;
+        return 0;
 }
 
 /*
@@ -695,7 +687,7 @@ static irqreturn_t hd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 static struct block_device_operations hd_fops = {
-        .ioctl =        hd_ioctl,
+        .getgeo =       hd_getgeo,
 };
 
 /*
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index ff2e217a8c84..0d3073f4eab4 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -69,7 +69,7 @@ static int check_in_drive_lists (ide_drive_t *drive, const char **list)
 static u8 svwks_ratemask (ide_drive_t *drive)
 {
         struct pci_dev *dev     = HWIF(drive)->pci_dev;
-        u8 mode;
+        u8 mode = 0;
 
         if (!svwks_revision)
                 pci_read_config_byte(dev, PCI_REVISION_ID, &svwks_revision);