2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 42e67ad6bd20..ab41be625a53 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -139,13 +139,12 @@ bail:		spin_unlock_irqrestore(&emsgs_lock, flags);
                 return;
         }
 
-        mp = kmalloc(n, GFP_ATOMIC);
+        mp = kmemdup(msg, n, GFP_ATOMIC);
         if (mp == NULL) {
                 printk(KERN_ERR "aoe: allocation failure, len=%ld\n", n);
                 goto bail;
         }
 
-        memcpy(mp, msg, n);
         em->msg = mp;
         em->flags |= EMFL_VALID;
         em->len = n;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7fecc784be01..037288e7874d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -856,6 +856,8 @@ static int __init nbd_init(void)
                 disk->queue->limits.discard_granularity = 512;
                 disk->queue->limits.max_discard_sectors = UINT_MAX;
                 disk->queue->limits.discard_zeroes_data = 0;
+                blk_queue_max_hw_sectors(disk->queue, 65536);
+                disk->queue->limits.max_sectors = 256;
         }
 
         if (register_blkdev(NBD_MAJOR, "nbd")) {