Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block: (95 commits)
  cciss: fix PCI IDs for new Smart Array controllers
  drbd: add race-breaker to drbd_go_diskless
  drbd: use dynamic_dev_dbg to optionally log uuid changes
  dynamic_debug.h: Fix dynamic_dev_dbg() macro if CONFIG_DYNAMIC_DEBUG not set
  drbd: cleanup: change "<= 0" to "== 0"
  drbd: relax the grace period of the md_sync timer again
  drbd: add some more explicit drbd_md_sync
  drbd: drop wrong debug asserts, fix recently introduced race
  drbd: cleanup useless leftover warn/error printk's
  drbd: add explicit drbd_md_sync to drbd_resync_finished
  drbd: Do not log an ASSERT for P_OV_REQUEST packets while C_CONNECTED
  drbd: fix for possible deadlock on IO error during resync
  drbd: fix unlikely access after free and list corruption
  drbd: fix for spurious fullsync (uuids rotated too fast)
  drbd: allow for explicit resync-finished notifications
  drbd: preparation commit, using full state in receive_state()
  drbd: drbd_send_ack_dp must not rely on header information
  drbd: Fix regression in recv_bm_rle_bits (compressed bitmap)
  drbd: Fixed a stupid copy and paste error
  drbd: Allow larger values for c-fill-target.
  ...

Fix up trivial conflict in drivers/block/ataflop.c due to BKL removal

1 files changed, 48 insertions, 12 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 4b852c962266..a1725e6488d3 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -115,8 +115,6 @@ static unsigned long int fd_def_df0 = FD_DD_3;     /* default for df0 if it does
 module_param(fd_def_df0, ulong, 0);
 MODULE_LICENSE("GPL");
 
-static struct request_queue *floppy_queue;
-
 /*
  *  Macros
  */
@@ -165,6 +163,7 @@ static volatile int selected = -1;	/* currently selected drive */
 static int writepending;
 static int writefromint;
 static char *raw_buf;
+static int fdc_queue;
 
 static DEFINE_SPINLOCK(amiflop_lock);
 
@@ -1335,6 +1334,42 @@ static int get_track(int drive, int track)
         return -1;
 }
 
+/*
+ * Round-robin between our available drives, doing one request from each
+ */
+static struct request *set_next_request(void)
+{
+        struct request_queue *q;
+        int cnt = FD_MAX_UNITS;
+        struct request *rq;
+
+        /* Find next queue we can dispatch from */
+        fdc_queue = fdc_queue + 1;
+        if (fdc_queue == FD_MAX_UNITS)
+                fdc_queue = 0;
+
+        for(cnt = FD_MAX_UNITS; cnt > 0; cnt--) {
+
+                if (unit[fdc_queue].type->code == FD_NODRIVE) {
+                        if (++fdc_queue == FD_MAX_UNITS)
+                                fdc_queue = 0;
+                        continue;
+                }
+
+                q = unit[fdc_queue].gendisk->queue;
+                if (q) {
+                        rq = blk_fetch_request(q);
+                        if (rq)
+                                break;
+                }
+
+                if (++fdc_queue == FD_MAX_UNITS)
+                        fdc_queue = 0;
+        }
+
+        return rq;
+}
+
 static void redo_fd_request(void)
 {
         struct request *rq;
@@ -1346,7 +1381,7 @@ static void redo_fd_request(void)
         int err;
 
 next_req:
-        rq = blk_fetch_request(floppy_queue);
+        rq = set_next_request();
         if (!rq) {
                 /* Nothing left to do */
                 return;
@@ -1683,6 +1718,13 @@ static int __init fd_probe_drives(void)
                         continue;
                 }
                 unit[drive].gendisk = disk;
+
+                disk->queue = blk_init_queue(do_fd_request, &amiflop_lock);
+                if (!disk->queue) {
+                        unit[drive].type->code = FD_NODRIVE;
+                        continue;
+                }
+
                 drives++;
                 if ((unit[drive].trackbuf = kmalloc(FLOPPY_MAX_SECTORS * 512, GFP_KERNEL)) == NULL) {
                         printk("no mem for ");
@@ -1696,7 +1738,6 @@ static int __init fd_probe_drives(void)
                 disk->fops = &floppy_fops;
                 sprintf(disk->disk_name, "fd%d", drive);
                 disk->private_data = &unit[drive];
-                disk->queue = floppy_queue;
                 set_capacity(disk, 880*2);
                 add_disk(disk);
         }
@@ -1744,11 +1785,6 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)
                 goto out_irq2;
         }
 
-        ret = -ENOMEM;
-        floppy_queue = blk_init_queue(do_fd_request, &amiflop_lock);
-        if (!floppy_queue)
-                goto out_queue;
-
         ret = -ENODEV;
         if (fd_probe_drives() < 1) /* No usable drives */
                 goto out_probe;
@@ -1792,8 +1828,6 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)
         return 0;
 
 out_probe:
-        blk_cleanup_queue(floppy_queue);
-out_queue:
         free_irq(IRQ_AMIGA_CIAA_TB, NULL);
 out_irq2:
         free_irq(IRQ_AMIGA_DSKBLK, NULL);
@@ -1811,9 +1845,12 @@ static int __exit amiga_floppy_remove(struct platform_device *pdev)
 
         for( i = 0; i < FD_MAX_UNITS; i++) {
                 if (unit[i].type->code != FD_NODRIVE) {
+                        struct request_queue *q = unit[i].gendisk->queue;
                         del_gendisk(unit[i].gendisk);
                         put_disk(unit[i].gendisk);
                         kfree(unit[i].trackbuf);
+                        if (q)
+                                blk_cleanup_queue(q);
                 }
         }
         blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
@@ -1821,7 +1858,6 @@ static int __exit amiga_floppy_remove(struct platform_device *pdev)
         free_irq(IRQ_AMIGA_DSKBLK, NULL);
         custom.dmacon = DMAF_DISK; /* disable DMA */
         amiga_chip_free(raw_buf);
-        blk_cleanup_queue(floppy_queue);
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 }
 #endif