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, 39 insertions, 11 deletions

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 8c021bb7a991..4e4cc6c828cb 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -80,8 +80,8 @@
 #undef DEBUG
 
 static DEFINE_MUTEX(ataflop_mutex);
-static struct request_queue *floppy_queue;
 static struct request *fd_request;
+static int fdc_queue;
 
 /* Disk types: DD, HD, ED */
 static struct atari_disk_type {
@@ -1392,6 +1392,29 @@ static void setup_req_params( int drive )
                         ReqTrack, ReqSector, (unsigned long)ReqData ));
 }
 
+/*
+ * Round-robin between our available drives, doing one request from each
+ */
+static struct request *set_next_request(void)
+{
+        struct request_queue *q;
+        int old_pos = fdc_queue;
+        struct request *rq;
+
+        do {
+                q = unit[fdc_queue].disk->queue;
+                if (++fdc_queue == FD_MAX_UNITS)
+                        fdc_queue = 0;
+                if (q) {
+                        rq = blk_fetch_request(q);
+                        if (rq)
+                                break;
+                }
+        } while (fdc_queue != old_pos);
+
+        return rq;
+}
+
 
 static void redo_fd_request(void)
 {
@@ -1406,7 +1429,7 @@ static void redo_fd_request(void)
 
 repeat:
         if (!fd_request) {
-                fd_request = blk_fetch_request(floppy_queue);
+                fd_request = set_next_request();
                 if (!fd_request)
                         goto the_end;
         }
@@ -1933,10 +1956,6 @@ static int __init atari_floppy_init (void)
         PhysTrackBuffer = virt_to_phys(TrackBuffer);
         BufferDrive = BufferSide = BufferTrack = -1;
 
-        floppy_queue = blk_init_queue(do_fd_request, &ataflop_lock);
-        if (!floppy_queue)
-                goto Enomem;
-
         for (i = 0; i < FD_MAX_UNITS; i++) {
                 unit[i].track = -1;
                 unit[i].flags = 0;
@@ -1945,7 +1964,10 @@ static int __init atari_floppy_init (void)
                 sprintf(unit[i].disk->disk_name, "fd%d", i);
                 unit[i].disk->fops = &floppy_fops;
                 unit[i].disk->private_data = &unit[i];
-                unit[i].disk->queue = floppy_queue;
+                unit[i].disk->queue = blk_init_queue(do_fd_request,
+                                        &ataflop_lock);
+                if (!unit[i].disk->queue)
+                        goto Enomem;
                 set_capacity(unit[i].disk, MAX_DISK_SIZE * 2);
                 add_disk(unit[i].disk);
         }
@@ -1960,10 +1982,14 @@ static int __init atari_floppy_init (void)
 
         return 0;
 Enomem:
-        while (i--)
+        while (i--) {
+                struct request_queue *q = unit[i].disk->queue;
+
                 put_disk(unit[i].disk);
-        if (floppy_queue)
-                blk_cleanup_queue(floppy_queue);
+                if (q)
+                        blk_cleanup_queue(q);
+        }
+
         unregister_blkdev(FLOPPY_MAJOR, "fd");
         return -ENOMEM;
 }
@@ -2012,12 +2038,14 @@ static void __exit atari_floppy_exit(void)
         int i;
         blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
         for (i = 0; i < FD_MAX_UNITS; i++) {
+                struct request_queue *q = unit[i].disk->queue;
+
                 del_gendisk(unit[i].disk);
                 put_disk(unit[i].disk);
+                blk_cleanup_queue(q);
         }
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 
-        blk_cleanup_queue(floppy_queue);
         del_timer_sync(&fd_timer);
         atari_stram_free( DMABuffer );
 }