Commit 0facb892 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:

 - block size setting fixes for loop/nbd (Jan Kara)

 - md bio_alloc_mddev() cleanup (Marcos)

 - Ensure we don't lose the REQ_INTEGRITY flag (Ming)

 - Two NVMe fixes by way of Christoph:
    - Fix NVMe IRQ calculation (Ming)
    - Uninitialized variable in nvmet-tcp (Sagi)

 - BFQ comment fix (Paolo)

 - License cleanup for recently added blk-mq-debugfs-zoned (Thomas)

* tag 'for-linus-20190118' of git://git.kernel.dk/linux-block:
  block: Cleanup license notice
  nvme-pci: fix nvme_setup_irqs()
  nvmet-tcp: fix uninitialized variable access
  block: don't lose track of REQ_INTEGRITY flag
  blockdev: Fix livelocks on loop device
  nbd: Use set_blocksize() to set device blocksize
  md: Make bio_alloc_mddev use bio_alloc_bioset
  block, bfq: fix comments on __bfq_deactivate_entity
parents 2339e91d 38197ca1

block/bfq-wf2q.c

+5 −6
Original line number Diff line number Diff line
@@ -1154,15 +1154,14 @@ static void bfq_activate_requeue_entity(struct bfq_entity *entity, 
}



/**

 * __bfq_deactivate_entity - deactivate an entity from its service tree.

 * @entity: the entity to deactivate.

 * __bfq_deactivate_entity - update sched_data and service trees for

 * entity, so as to represent entity as inactive

 * @entity: the entity being deactivated.

 * @ins_into_idle_tree: if false, the entity will not be put into the

 *			idle tree.

 *

 * Deactivates an entity, independently of its previous state.  Must

 * be invoked only if entity is on a service tree. Extracts the entity

 * from that tree, and if necessary and allowed, puts it into the idle

 * tree.

 * If necessary and allowed, puts entity into the idle tree. NOTE:

 * entity may be on no tree if in service.

 */

bool __bfq_deactivate_entity(struct bfq_entity *entity, bool ins_into_idle_tree)

{

block/blk-mq-debugfs-zoned.c

+0 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2017 Western Digital Corporation or its affiliates.

 *

 * This file is released under the GPL.

 */



#include <linux/blkdev.h>

block/blk-mq.c

+2 −1
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 
{

	const int is_sync = op_is_sync(bio->bi_opf);

	const int is_flush_fua = op_is_flush(bio->bi_opf);

	struct blk_mq_alloc_data data = { .flags = 0, .cmd_flags = bio->bi_opf };

	struct blk_mq_alloc_data data = { .flags = 0};

	struct request *rq;

	struct blk_plug *plug;

	struct request *same_queue_rq = NULL;
@@ -1928,6 +1928,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 


	rq_qos_throttle(q, bio);



	data.cmd_flags = bio->bi_opf;

	rq = blk_mq_get_request(q, bio, &data);

	if (unlikely(!rq)) {

		rq_qos_cleanup(q, bio);

drivers/block/nbd.c

+3 −2
Original line number Diff line number Diff line
@@ -288,9 +288,10 @@ static void nbd_size_update(struct nbd_device *nbd) 
	blk_queue_physical_block_size(nbd->disk->queue, config->blksize);

	set_capacity(nbd->disk, config->bytesize >> 9);

	if (bdev) {

		if (bdev->bd_disk)

		if (bdev->bd_disk) {

			bd_set_size(bdev, config->bytesize);

		else

			set_blocksize(bdev, config->blksize);

		} else

			bdev->bd_invalidated = 1;

		bdput(bdev);

	}

drivers/md/md.c

+1 −6
Original line number Diff line number Diff line
@@ -207,15 +207,10 @@ static bool create_on_open = true; 
struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,

			    struct mddev *mddev)

{

	struct bio *b;



	if (!mddev || !bioset_initialized(&mddev->bio_set))

		return bio_alloc(gfp_mask, nr_iovecs);



	b = bio_alloc_bioset(gfp_mask, nr_iovecs, &mddev->bio_set);

	if (!b)

		return NULL;

	return b;

	return bio_alloc_bioset(gfp_mask, nr_iovecs, &mddev->bio_set);

}

EXPORT_SYMBOL_GPL(bio_alloc_mddev);