Commit 19240e6b authored Sep 25, 2017 by Linus Torvalds

linux-block

Pull block fixes from Jens Axboe:

 - Two sets of NVMe pull requests from Christoph:
      - Fixes for the Fibre Channel host/target to fix spec compliance
      - Allow a zero keep alive timeout
      - Make the debug printk for broken SGLs work better
      - Fix queue zeroing during initialization
      - Set of RDMA and FC fixes
      - Target div-by-zero fix

 - bsg double-free fix.

 - ndb unknown ioctl fix from Josef.

 - Buffered vs O_DIRECT page cache inconsistency fix. Has been floating
   around for a long time, well reviewed. From Lukas.

 - brd overflow fix from Mikulas.

 - Fix for a loop regression in this merge window, where using a union
   for two members of the loop_cmd turned out to be a really bad idea.
   From Omar.

 - Fix for an iostat regression fix in this series, using the wrong API
   to get at the block queue. From Shaohua.

 - Fix for a potential blktrace delection deadlock. From Waiman.

* 'for-linus' of git://git.kernel.dk/linux-block: (30 commits)
  nvme-fcloop: fix port deletes and callbacks
  nvmet-fc: sync header templates with comments
  nvmet-fc: ensure target queue id within range.
  nvmet-fc: on port remove call put outside lock
  nvme-rdma: don't fully stop the controller in error recovery
  nvme-rdma: give up reconnect if state change fails
  nvme-core: Use nvme_wq to queue async events and fw activation
  nvme: fix sqhd reference when admin queue connect fails
  block: fix a crash caused by wrong API
  fs: Fix page cache inconsistency when mixing buffered and AIO DIO
  nvmet: implement valid sqhd values in completions
  nvme-fabrics: Allow 0 as KATO value
  nvme: allow timed-out ios to retry
  nvme: stop aer posting if controller state not live
  nvme-pci: Print invalid SGL only once
  nvme-pci: initialize queue memory before interrupts
  nvmet-fc: fix failing max io queue connections
  nvme-fc: use transport-specific sgl format
  nvme: add transport SGL definitions
  nvme.h: remove FC transport-specific error values
  ...

parents 17763641 fddc9923

block/blk-core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -854,6 +854,9 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)

		kobject_init(&q->kobj, &blk_queue_ktype);

		#ifdef CONFIG_BLK_DEV_IO_TRACE
		mutex_init(&q->blk_trace_mutex);
		#endif
		mutex_init(&q->sysfs_lock);
		spin_lock_init(&q->__queue_lock);

block/bsg-lib.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,6 @@ static int bsg_prepare_job(struct device dev, struct request req)
		failjob_rls_rqst_payload:
		kfree(job->request_payload.sg_list);
		failjob_rls_job:
		kfree(job);
		return -ENOMEM;
		}

block/partition-generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ ssize_t part_stat_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct hd_struct *p = dev_to_part(dev);
		struct request_queue *q = dev_to_disk(dev)->queue;
		struct request_queue *q = part_to_disk(p)->queue;
		unsigned int inflight[2];
		int cpu;

drivers/block/brd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,

		if (!brd)
		return -ENODEV;
		page = brd_insert_page(brd, PFN_PHYS(pgoff) / 512);
		page = brd_insert_page(brd, (sector_t)pgoff << PAGE_SECTORS_SHIFT);
		if (!page)
		return -ENOSPC;
		*kaddr = page_address(page);

drivers/block/loop.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -67,10 +67,8 @@ struct loop_device {
		struct loop_cmd {
		struct kthread_work work;
		struct request *rq;
		union {
		bool use_aio; /* use AIO interface to handle I/O */
		atomic_t ref; /* only for aio */
		};
		long ret;
		struct kiocb iocb;
		struct bio_vec *bvec;

Admin message