From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Oct 2014 19:12:45 +0000 (-0700)
Subject: Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.14-rc1~6632
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e75437fb9322cf0ac707046a12d78a25f9d52ccf;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull block layer driver update from Jens Axboe:
 "This is the block driver pull request for 3.18.  Not a lot in there
  this round, and nothing earth shattering.

   - A round of drbd fixes from the linbit team, and an improvement in
     asender performance.

   - Removal of deprecated (and unused) IRQF_DISABLED flag in rsxx and
     hd from Michael Opdenacker.

   - Disable entropy collection from flash devices by default, from Mike
     Snitzer.

   - A small collection of xen blkfront/back fixes from Roger Pau Monné
     and Vitaly Kuznetsov"

* 'for-3.18/drivers' of git://git.kernel.dk/linux-block:
  block: disable entropy contributions for nonrot devices
  xen, blkfront: factor out flush-related checks from do_blkif_request()
  xen-blkback: fix leak on grant map error path
  xen/blkback: unmap all persistent grants when frontend gets disconnected
  rsxx: Remove deprecated IRQF_DISABLED
  block: hd: remove deprecated IRQF_DISABLED
  drbd: use RB_DECLARE_CALLBACKS() to define augment callbacks
  drbd: compute the end before rb_insert_augmented()
  drbd: Add missing newline in resync progress display in /proc/drbd
  drbd: reduce lock contention in drbd_worker
  drbd: Improve asender performance
  drbd: Get rid of the WORK_PENDING macro
  drbd: Get rid of the __no_warn and __cond_lock macros
  drbd: Avoid inconsistent locking warning
  drbd: Remove superfluous newline from "resync_extents" debugfs entry.
  drbd: Use consistent names for all the bi_end_io callbacks
  drbd: Use better variable names
---

e75437fb9322cf0ac707046a12d78a25f9d52ccf
diff --cc drivers/block/null_blk.c
index ac50a29,b0d94b6..2671a3f
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@@ -521,12 -507,11 +521,13 @@@ static int null_add_dev(void
  
  	nullb->q->queuedata = nullb;
  	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);
+ 	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, nullb->q);
  
  	disk = nullb->disk = alloc_disk_node(1, home_node);
 -	if (!disk)
 +	if (!disk) {
 +		rv = -ENOMEM;
  		goto out_cleanup_blk_queue;
 +	}
  
  	mutex_lock(&lock);
  	list_add_tail(&nullb->list, &nullb_list);