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

Commit 564884fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:
 "A set of fixes that wasn't included in the first merge window pull
  request.  This pull request contains:

   - A set of NVMe fixes from Keith, and one from Nic for the integrity
     side of it.

   - Fix from Ming, clearing ->mq_ops if we don't successfully setup a
     queue for multiqueue.

   - A set of stability fixes for bcache from Jiri, and also marking
     bcache as orphaned as it's no longer actively maintained (in
     mainline, at least)"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: clear q->mq_ops if init fail
  MAINTAINERS: mark bcache as orphan
  bcache: bch_gc_thread() is not freezable
  bcache: bch_allocator_thread() is not freezable
  bcache: bch_writeback_thread() is not freezable
  nvme/host: Add missing blk_integrity tag_size + flags assignments
  NVMe: Add device ID's with stripe quirk
  NVMe: Short-cut removal on surprise hot-unplug
  NVMe: Allow user initiated rescan
  NVMe: Reduce driver log spamming
  NVMe: Unbind driver on failure
  NVMe: Delete only created queues
  NVMe: Allocate queues only for online cpus
parents 4cae85be c7de5726

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2304,7 +2304,7 @@ BCACHE (BLOCK LAYER CACHE) 
M:	Kent Overstreet <kent.overstreet@gmail.com>

L:	linux-bcache@vger.kernel.org

W:	http://bcache.evilpiepirate.org

S:	Maintained

S:	Orphan

F:	drivers/md/bcache/



BDISP ST MEDIA DRIVER

block/blk-mq.c

+3 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, 


	q->queue_ctx = alloc_percpu(struct blk_mq_ctx);

	if (!q->queue_ctx)

		return ERR_PTR(-ENOMEM);

		goto err_exit;



	q->queue_hw_ctx = kzalloc_node(nr_cpu_ids * sizeof(*(q->queue_hw_ctx)),

						GFP_KERNEL, set->numa_node);
@@ -2084,6 +2084,8 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, 
	kfree(q->queue_hw_ctx);

err_percpu:

	free_percpu(q->queue_ctx);

err_exit:

	q->mq_ops = NULL;

	return ERR_PTR(-ENOMEM);

}

EXPORT_SYMBOL(blk_mq_init_allocated_queue);

drivers/md/bcache/alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
#include "btree.h"



#include <linux/blkdev.h>

#include <linux/freezer.h>

#include <linux/kthread.h>

#include <linux/random.h>

#include <trace/events/bcache.h>
@@ -288,7 +287,6 @@ do { \ 
		if (kthread_should_stop())				\

			return 0;					\

									\

		try_to_freeze();					\

		schedule();						\

		mutex_lock(&(ca)->set->bucket_lock);			\

	}								\

drivers/md/bcache/btree.c

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <linux/slab.h>

#include <linux/bitops.h>

#include <linux/freezer.h>

#include <linux/hash.h>

#include <linux/kthread.h>

#include <linux/prefetch.h>
@@ -1787,7 +1786,6 @@ static int bch_gc_thread(void *arg) 


		mutex_unlock(&c->bucket_lock);



		try_to_freeze();

		schedule();

	}

drivers/md/bcache/writeback.c

+0 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "writeback.h"



#include <linux/delay.h>

#include <linux/freezer.h>

#include <linux/kthread.h>

#include <trace/events/bcache.h>
@@ -228,7 +227,6 @@ static void read_dirty(struct cached_dev *dc) 
	 */



	while (!kthread_should_stop()) {

		try_to_freeze();



		w = bch_keybuf_next(&dc->writeback_keys);

		if (!w)
@@ -433,7 +431,6 @@ static int bch_writeback_thread(void *arg) 
			if (kthread_should_stop())

				return 0;



			try_to_freeze();

			schedule();

			continue;

		}