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

* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block:
  cfq: set workload as expired if it doesn't have any slice left
  Fix a CFQ crash in "for-2.6.33" branch of block tree
  cfq: Remove wait_request flag when idle time is being deleted
  cfq-iosched: commenting non-obvious initialization
  cfq-iosched: Take care of corner cases of group losing share due to deletion
  cfq-iosched: Get rid of cfqq wait_busy_done flag
  cfq: Optimization for close cooperating queue searching
  block,xd: Delay allocation of DMA buffers until device is known
  drbd: Following the hmac change to SHASH (see linux commit 8bd1209cfff)
  cfq-iosched: reduce write depth only if sync was delayed

2 files changed, 20 insertions, 13 deletions

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 436a090b532b..4e0726aa53b0 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1271,8 +1271,7 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
                         goto fail;
                 }
 
-                if (crypto_tfm_alg_type(crypto_hash_tfm(tfm))
-                                                != CRYPTO_ALG_TYPE_HASH) {
+                if (crypto_tfm_alg_type(crypto_hash_tfm(tfm)) != CRYPTO_ALG_TYPE_SHASH) {
                         retcode = ERR_AUTH_ALG_ND;
                         goto fail;
                 }
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 0877d3628fda..d1fd032e7514 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -169,13 +169,6 @@ static int __init xd_init(void)
 
         init_timer (&xd_watchdog_int); xd_watchdog_int.function = xd_watchdog;
 
-        if (!xd_dma_buffer)
-                xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
-        if (!xd_dma_buffer) {
-                printk(KERN_ERR "xd: Out of memory.\n");
-                return -ENOMEM;
-        }
-
         err = -EBUSY;
         if (register_blkdev(XT_DISK_MAJOR, "xd"))
                 goto out1;
@@ -202,6 +195,19 @@ static int __init xd_init(void)
                         xd_drives,xd_drives == 1 ? "" : "s",xd_irq,xd_dma);
         }
 
+        /*
+         * With the drive detected, xd_maxsectors should now be known.
+         * If xd_maxsectors is 0, nothing was detected and we fall through
+         * to return -ENODEV
+         */
+        if (!xd_dma_buffer && xd_maxsectors) {
+                xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
+                if (!xd_dma_buffer) {
+                        printk(KERN_ERR "xd: Out of memory.\n");
+                        goto out3;
+                }
+        }
+
         err = -ENODEV;
         if (!xd_drives)
                 goto out3;
@@ -249,15 +255,17 @@ out4:
         for (i = 0; i < xd_drives; i++)
                 put_disk(xd_gendisk[i]);
 out3:
-        release_region(xd_iobase,4);
+        if (xd_maxsectors)
+                release_region(xd_iobase,4);
+
+        if (xd_dma_buffer)
+                xd_dma_mem_free((unsigned long)xd_dma_buffer,
+                                xd_maxsectors * 0x200);
 out2:
         blk_cleanup_queue(xd_queue);
 out1a:
         unregister_blkdev(XT_DISK_MAJOR, "xd");
 out1:
-        if (xd_dma_buffer)
-                xd_dma_mem_free((unsigned long)xd_dma_buffer,
-                                xd_maxsectors * 0x200);
         return err;
 Enomem:
         err = -ENOMEM;