Commit d429a363 authored Aug 14, 2014 by Linus Torvalds

linux-block

Pull block driver changes from Jens Axboe:
 "Nothing out of the ordinary here, this pull request contains:

   - A big round of fixes for bcache from Kent Overstreet, Slava Pestov,
     and Surbhi Palande.  No new features, just a lot of fixes.

   - The usual round of drbd updates from Andreas Gruenbacher, Lars
     Ellenberg, and Philipp Reisner.

   - virtio_blk was converted to blk-mq back in 3.13, but now Ming Lei
     has taken it one step further and added support for actually using
     more than one queue.

   - Addition of an explicit SG_FLAG_Q_AT_HEAD for block/bsg, to
     compliment the the default behavior of adding to the tail of the
     queue.  From Douglas Gilbert"

* 'for-3.17/drivers' of git://git.kernel.dk/linux-block: (86 commits)
  bcache: Drop unneeded blk_sync_queue() calls
  bcache: add mutex lock for bch_is_open
  bcache: Correct printing of btree_gc_max_duration_ms
  bcache: try to set b->parent properly
  bcache: fix memory corruption in init error path
  bcache: fix crash with incomplete cache set
  bcache: Fix more early shutdown bugs
  bcache: fix use-after-free in btree_gc_coalesce()
  bcache: Fix an infinite loop in journal replay
  bcache: fix crash in bcache_btree_node_alloc_fail tracepoint
  bcache: bcache_write tracepoint was crashing
  bcache: fix typo in bch_bkey_equal_header
  bcache: Allocate bounce buffers with GFP_NOWAIT
  bcache: Make sure to pass GFP_WAIT to mempool_alloc()
  bcache: fix uninterruptible sleep in writeback thread
  bcache: wait for buckets when allocating new btree root
  bcache: fix crash on shutdown in passthrough mode
  bcache: fix lockdep warnings on shutdown
  bcache allocator: send discards with correct size
  bcache: Fix to remove the rcu_sched stalls.
  ...

parents 4a319a49 99d54001

block/scsi_ioctl.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -290,6 +290,7 @@ static int sg_io(struct request_queue q, struct gendisk bd_disk,
		unsigned long start_time;
		ssize_t ret = 0;
		int writing = 0;
		int at_head = 0;
		struct request *rq;
		char sense[SCSI_SENSE_BUFFERSIZE];
		struct bio *bio;
		@@ -313,6 +314,8 @@ static int sg_io(struct request_queue q, struct gendisk bd_disk,
		case SG_DXFER_FROM_DEV:
		break;
		}
		if (hdr->flags & SG_FLAG_Q_AT_HEAD)
		at_head = 1;

		rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
		if (!rq)
		@@ -369,7 +372,7 @@ static int sg_io(struct request_queue q, struct gendisk bd_disk,
		* (if he doesn't check that is his problem).
		* N.B. a non-zero SCSI status is _not_ necessarily an error.
		*/
		blk_execute_rq(q, bd_disk, rq, 0);
		blk_execute_rq(q, bd_disk, rq, at_head);

		hdr->duration = jiffies_to_msecs(jiffies - start_time);

drivers/block/drbd/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,5 +3,6 @@ drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o
		drbd-y += drbd_main.o drbd_strings.o drbd_nl.o
		drbd-y += drbd_interval.o drbd_state.o
		drbd-y += drbd_nla.o
		drbd-$(CONFIG_DEBUG_FS) += drbd_debugfs.o

		obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o

drivers/block/drbd/drbd_actlog.c

+200 −318

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_bitmap.c

+52 −98

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_debugfs.c

0 → 100644

+958 −0

File added.

Preview size limit exceeded, changes collapsed.