5 files changed, 39 insertions, 33 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e57ac5a43246..875ae7699025 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -400,13 +400,16 @@ config BLK_DEV_RAM_SIZE
           8192.
 
 config BLK_DEV_INITRD
-        bool "Initial RAM disk (initrd) support"
+        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
         help
-          The initial RAM disk is a RAM disk that is loaded by the boot loader
-          (loadlin or lilo) and that is mounted as root before the normal boot
-          procedure. It is typically used to load modules needed to mount the
-          "real" root file system, etc. See <file:Documentation/initrd.txt>
-          for details.
+          The initial RAM filesystem is a ramfs which is loaded by the
+          boot loader (loadlin or lilo) and that is mounted as root
+          before the normal boot procedure. It is typically used to
+          load modules needed to mount the "real" root file system,
+          etc. See <file:Documentation/initrd.txt> for details.
+
+          If RAM disk support (BLK_DEV_RAM) is also included, this
+          also enables initial RAM disk (initrd) support.
 
 
 config CDROM_PKTCDVD
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 32fea55fac48..393b86a3dbf8 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -211,9 +211,7 @@ aoeblk_gdalloc(void *vp)
                 return;
         }
 
-        d->bufpool = mempool_create(MIN_BUFS,
-                                    mempool_alloc_slab, mempool_free_slab,
-                                    buf_pool_cache);
+        d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
                 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
                         "for %ld.%ld\n", d->aoemajor, d->aoeminor);
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 840919bba76c..d3ad9081697e 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -250,6 +250,18 @@ static int irqdma_allocated;
 #include <linux/cdrom.h>        /* for the compatibility eject ioctl */
 #include <linux/completion.h>
 
+/*
+ * Interrupt freeing also means /proc VFS work - dont do it
+ * from interrupt context. We push this work into keventd:
+ */
+static void fd_free_irq_fn(void *data)
+{
+        fd_free_irq();
+}
+
+static DECLARE_WORK(fd_free_irq_work, fd_free_irq_fn, NULL);
+
+
 static struct request *current_req;
 static struct request_queue *floppy_queue;
 static void do_fd_request(request_queue_t * q);
@@ -4433,6 +4445,13 @@ static int floppy_grab_irq_and_dma(void)
                 return 0;
         }
         spin_unlock_irqrestore(&floppy_usage_lock, flags);
+
+        /*
+         * We might have scheduled a free_irq(), wait it to
+         * drain first:
+         */
+        flush_scheduled_work();
+
         if (fd_request_irq()) {
                 DPRINT("Unable to grab IRQ%d for the floppy driver\n",
                        FLOPPY_IRQ);
@@ -4522,7 +4541,7 @@ static void floppy_release_irq_and_dma(void)
         if (irqdma_allocated) {
                 fd_disable_dma();
                 fd_free_dma();
-                fd_free_irq();
+                schedule_work(&fd_free_irq_work);
                 irqdma_allocated = 0;
         }
         set_dor(0, ~0, 8);
@@ -4633,6 +4652,8 @@ void cleanup_module(void)
         /* eject disk, if any */
         fd_eject(0);
 
+        flush_scheduled_work();         /* fd_free_irq() might be pending */
+
         wait_for_completion(&device_release);
 }
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 74bf0255e98f..9c3b94e8f03b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -839,7 +839,9 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
 
         set_blocksize(bdev, lo_blocksize);
 
-        kernel_thread(loop_thread, lo, CLONE_KERNEL);
+        error = kernel_thread(loop_thread, lo, CLONE_KERNEL);
+        if (error < 0)
+                goto out_putf;
         wait_for_completion(&lo->lo_done);
         return 0;
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 1d261f985f31..a04f60693c39 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -230,16 +230,6 @@ static int pkt_grow_pktlist(struct pktcdvd_device *pd, int nr_packets)
         return 1;
 }
 
-static void *pkt_rb_alloc(gfp_t gfp_mask, void *data)
-{
-        return kmalloc(sizeof(struct pkt_rb_node), gfp_mask);
-}
-
-static void pkt_rb_free(void *ptr, void *data)
-{
-        kfree(ptr);
-}
-
 static inline struct pkt_rb_node *pkt_rbtree_next(struct pkt_rb_node *node)
 {
         struct rb_node *n = rb_next(&node->rb_node);
@@ -2073,16 +2063,6 @@ static int pkt_close(struct inode *inode, struct file *file)
 }
 
 
-static void *psd_pool_alloc(gfp_t gfp_mask, void *data)
-{
-        return kmalloc(sizeof(struct packet_stacked_data), gfp_mask);
-}
-
-static void psd_pool_free(void *ptr, void *data)
-{
-        kfree(ptr);
-}
-
 static int pkt_end_io_read_cloned(struct bio *bio, unsigned int bytes_done, int err)
 {
         struct packet_stacked_data *psd = bio->bi_private;
@@ -2475,7 +2455,8 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd)
         if (!pd)
                 return ret;
 
-        pd->rb_pool = mempool_create(PKT_RB_POOL_SIZE, pkt_rb_alloc, pkt_rb_free, NULL);
+        pd->rb_pool = mempool_create_kmalloc_pool(PKT_RB_POOL_SIZE,
+                                                  sizeof(struct pkt_rb_node));
         if (!pd->rb_pool)
                 goto out_mem;
 
@@ -2639,7 +2620,8 @@ static int __init pkt_init(void)
 {
         int ret;
 
-        psd_pool = mempool_create(PSD_POOL_SIZE, psd_pool_alloc, psd_pool_free, NULL);
+        psd_pool = mempool_create_kmalloc_pool(PSD_POOL_SIZE,
+                                        sizeof(struct packet_stacked_data));
         if (!psd_pool)
                 return -ENOMEM;