Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4476c0ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block driver update from Jens Axboe:
 "Distilled down variant, the rest will pass over to 3.8.  I pulled it
  into the for-linus branch I had waiting for a pull request as well, in
  case you are wondering why there are new entries in here too.  This
  also got rid of two reverts and the ones of the mtip32xx patches that
  went in later in the 3.6 cycle, so the series looks a bit cleaner."

* 'for-linus' of git://git.kernel.dk/linux-block:
  loop: Make explicit loop device destruction lazy
  mtip32xx:Added appropriate timeout value for secure erase
  xen/blkback: Change xen_vbd's flush_support and discard_secure to have type unsigned int, rather than bool
  cciss: select CONFIG_CHECK_SIGNATURE
  cciss: remove unneeded memset()
  xen/blkback: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  pktcdvd: update MAINTAINERS
  floppy: remove dr, reuse drive on do_floppy_init
  floppy: use common function to check if floppies can be registered
  floppy: properly handle failure on add_disk loop
  floppy: do put_disk on current dr if blk_init_queue fails
  floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop
  xen/blkback: Fix compile warning
  block: Add blk_rq_pos(rq) to sort rq when plushing
  drivers/block: remove CONFIG_EXPERIMENTAL
  block: remove CONFIG_EXPERIMENTAL
  vfs: fix: don't increase bio_slab_max if krealloc() fails
  blkcg: stop iteration early if root_rl is the only request list
  blkcg: Fix use-after-free of q->root_blkg and q->root_rl.blkg
parents 35fd3dc5 a1ecac3b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5647,7 +5647,7 @@ S: Maintained 
F:	drivers/pinctrl/spear/



PKTCDVD DRIVER

M:	Peter Osterlund <petero2@telia.com>

M:	Jiri Kosina <jkosina@suse.cz>

S:	Maintained

F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h

block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ config BLK_DEV_INTEGRITY 


config BLK_DEV_THROTTLING

	bool "Block layer bio throttling support"

	depends on BLK_CGROUP=y && EXPERIMENTAL

	depends on BLK_CGROUP=y

	default n

	---help---

	Block layer bio throttling support. It can be used to limit

block/blk-cgroup.c

+10 −0
Original line number Diff line number Diff line
@@ -285,6 +285,13 @@ static void blkg_destroy_all(struct request_queue *q) 
		blkg_destroy(blkg);

		spin_unlock(&blkcg->lock);

	}



	/*

	 * root blkg is destroyed.  Just clear the pointer since

	 * root_rl does not take reference on root blkg.

	 */

	q->root_blkg = NULL;

	q->root_rl.blkg = NULL;

}



static void blkg_rcu_free(struct rcu_head *rcu_head)
@@ -326,6 +333,9 @@ struct request_list *__blk_queue_next_rl(struct request_list *rl, 
	 */

	if (rl == &q->root_rl) {

		ent = &q->blkg_list;

		/* There are no more block groups, hence no request lists */

		if (list_empty(ent))

			return NULL;

	} else {

		blkg = container_of(rl, struct blkcg_gq, rl);

		ent = &blkg->q_node;

block/blk-core.c

+2 −1
Original line number Diff line number Diff line
@@ -2868,7 +2868,8 @@ static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b) 
	struct request *rqa = container_of(a, struct request, queuelist);

	struct request *rqb = container_of(b, struct request, queuelist);



	return !(rqa->q <= rqb->q);

	return !(rqa->q < rqb->q ||

		(rqa->q == rqb->q && blk_rq_pos(rqa) < blk_rq_pos(rqb)));

}



/*

drivers/block/Kconfig

+8 −7
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ config BLK_CPQ_DA 
config BLK_CPQ_CISS_DA

	tristate "Compaq Smart Array 5xxx support"

	depends on PCI

	select CHECK_SIGNATURE

	help

	  This is the driver for Compaq Smart Array 5xxx controllers.

	  Everyone using these boards should say Y here.
@@ -166,8 +167,8 @@ config BLK_DEV_DAC960 
	  module will be called DAC960.



config BLK_DEV_UMEM

	tristate "Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	tristate "Micro Memory MM5415 Battery Backed RAM support"

	depends on PCI

	---help---

	  Saying Y here will include support for the MM5415 family of

	  battery backed (Non-volatile) RAM cards.
@@ -430,8 +431,8 @@ config CDROM_PKTCDVD_BUFFERS 
	  a disc is opened for writing.



config CDROM_PKTCDVD_WCACHE

	bool "Enable write caching (EXPERIMENTAL)"

	depends on CDROM_PKTCDVD && EXPERIMENTAL

	bool "Enable write caching"

	depends on CDROM_PKTCDVD

	help

	  If enabled, write caching will be set for the CD-R/W device. For now

	  this option is dangerous unless the CD-RW media is known good, as we
@@ -508,8 +509,8 @@ config XEN_BLKDEV_BACKEND 




config VIRTIO_BLK

	tristate "Virtio block driver (EXPERIMENTAL)"

	depends on EXPERIMENTAL && VIRTIO

	tristate "Virtio block driver"

	depends on VIRTIO

	---help---

	  This is the virtual block driver for virtio.  It can be used with

          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
@@ -528,7 +529,7 @@ config BLK_DEV_HD 


config BLK_DEV_RBD

	tristate "Rados block device (RBD)"

	depends on INET && EXPERIMENTAL && BLOCK

	depends on INET && BLOCK

	select CEPH_LIB

	select LIBCRC32C

	select CRYPTO_AES