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

Commit d476c533 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 should go into this release. This contains:

   - An NVMe pull request from Christoph, with a few critical fixes for
     NVMe.

   - A block drain queue fix from Ming.

   - The concurrent lo_open/release fix for loop"

* 'for-linus' of git://git.kernel.dk/linux-block:
  loop: fix concurrent lo_open/lo_release
  block: drain queue before waiting for q_usage_counter becoming zero
  nvme-fcloop: avoid possible uninitialized variable warning
  nvme-mpath: fix last path removal during traffic
  nvme-rdma: fix concurrent reset and reconnect
  nvme: fix sector units when going between formats
  nvme-pci: move use_sgl initialization to nvme_init_iod()
parents ef7f8cec ae665016

block/blk-core.c

+7 −2
Original line number Diff line number Diff line
@@ -562,6 +562,13 @@ static void __blk_drain_queue(struct request_queue *q, bool drain_all) 
	}

}



void blk_drain_queue(struct request_queue *q)

{

	spin_lock_irq(q->queue_lock);

	__blk_drain_queue(q, true);

	spin_unlock_irq(q->queue_lock);

}



/**

 * blk_queue_bypass_start - enter queue bypass mode

 * @q: queue of interest
@@ -689,8 +696,6 @@ void blk_cleanup_queue(struct request_queue *q) 
	 */

	blk_freeze_queue(q);

	spin_lock_irq(lock);

	if (!q->mq_ops)

		__blk_drain_queue(q, true);

	queue_flag_set(QUEUE_FLAG_DEAD, q);

	spin_unlock_irq(lock);

block/blk-mq.c

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ void blk_freeze_queue(struct request_queue *q) 
	 * exported to drivers as the only user for unfreeze is blk_mq.

	 */

	blk_freeze_queue_start(q);

	if (!q->mq_ops)

		blk_drain_queue(q);

	blk_mq_freeze_queue_wait(q);

}

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -330,4 +330,6 @@ static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio) 
}

#endif /* CONFIG_BOUNCE */



extern void blk_drain_queue(struct request_queue *q);



#endif /* BLK_INTERNAL_H */

drivers/block/loop.c

+8 −2
Original line number Diff line number Diff line
@@ -1581,9 +1581,8 @@ static int lo_open(struct block_device *bdev, fmode_t mode) 
	return err;

}



static void lo_release(struct gendisk *disk, fmode_t mode)

static void __lo_release(struct loop_device *lo)

{

	struct loop_device *lo = disk->private_data;

	int err;



	if (atomic_dec_return(&lo->lo_refcnt))
@@ -1610,6 +1609,13 @@ static void lo_release(struct gendisk *disk, fmode_t mode) 
	mutex_unlock(&lo->lo_ctl_mutex);

}



static void lo_release(struct gendisk *disk, fmode_t mode)

{

	mutex_lock(&loop_index_mutex);

	__lo_release(disk->private_data);

	mutex_unlock(&loop_index_mutex);

}



static const struct block_device_operations lo_fops = {

	.owner =	THIS_MODULE,

	.open =		lo_open,

drivers/nvme/host/core.c

+6 −1
Original line number Diff line number Diff line
@@ -1335,6 +1335,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 
		struct nvme_ns *ns, struct nvme_id_ns *id)

{

	sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9);

	unsigned short bs = 1 << ns->lba_shift;

	unsigned stream_alignment = 0;



	if (ns->ctrl->nr_streams && ns->sws && ns->sgs)
@@ -1343,7 +1344,10 @@ static void nvme_update_disk_info(struct gendisk *disk, 
	blk_mq_freeze_queue(disk->queue);

	blk_integrity_unregister(disk);



	blk_queue_logical_block_size(disk->queue, 1 << ns->lba_shift);

	blk_queue_logical_block_size(disk->queue, bs);

	blk_queue_physical_block_size(disk->queue, bs);

	blk_queue_io_min(disk->queue, bs);



	if (ns->ms && !ns->ext &&

	    (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))

		nvme_init_integrity(disk, ns->ms, ns->pi_type);
@@ -2987,6 +2991,7 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
	mutex_unlock(&ns->ctrl->namespaces_mutex);



	synchronize_srcu(&ns->head->srcu);

	nvme_mpath_check_last_path(ns);

	nvme_put_ns(ns);

}