Commit 9820b4dc authored Feb 21, 2021 by Linus Torvalds

linux-block

Pull block driver updates from Jens Axboe:

 - Remove the skd driver. It's been EOL for a long time (Damien)

 - NVMe pull requests
      - fix multipath handling of ->queue_rq errors (Chao Leng)
      - nvmet cleanups (Chaitanya Kulkarni)
      - add a quirk for buggy Amazon controller (Filippo Sironi)
      - avoid devm allocations in nvme-hwmon that don't interact well
        with fabrics (Hannes Reinecke)
      - sysfs cleanups (Jiapeng Chong)
      - fix nr_zones for multipath (Keith Busch)
      - nvme-tcp crash fix for no-data commands (Sagi Grimberg)
      - nvmet-tcp fixes (Sagi Grimberg)
      - add a missing __rcu annotation (Christoph)
      - failed reconnect fixes (Chao Leng)
      - various tracing improvements (Michal Krakowiak, Johannes
        Thumshirn)
      - switch the nvmet-fc assoc_list to use RCU protection (Leonid
        Ravich)
      - resync the status codes with the latest spec (Max Gurtovoy)
      - minor nvme-tcp improvements (Sagi Grimberg)
      - various cleanups (Rikard Falkeborn, Minwoo Im, Chaitanya
        Kulkarni, Israel Rukshin)

 - Floppy O_NDELAY fix (Denis)

 - MD pull request
      - raid5 chunk_sectors fix (Guoqing)

 - Use lore links (Kees)

 - Use DEFINE_SHOW_ATTRIBUTE for nbd (Liao)

 - loop lock scaling (Pavel)

 - mtip32xx PCI fixes (Bjorn)

 - bcache fixes (Kai, Dongdong)

 - Misc fixes (Tian, Yang, Guoqing, Joe, Andy)

* tag 'for-5.12/drivers-2021-02-17' of git://git.kernel.dk/linux-block: (64 commits)
  lightnvm: pblk: Replace guid_copy() with export_guid()/import_guid()
  lightnvm: fix unnecessary NULL check warnings
  nvme-tcp: fix crash triggered with a dataless request submission
  block: Replace lkml.org links with lore
  nbd: Convert to DEFINE_SHOW_ATTRIBUTE
  nvme: add 48-bit DMA address quirk for Amazon NVMe controllers
  nvme-hwmon: rework to avoid devm allocation
  nvmet: remove else at the end of the function
  nvmet: add nvmet_req_subsys() helper
  nvmet: use min of device_path and disk len
  nvmet: use invalid cmd opcode helper
  nvmet: use invalid cmd opcode helper
  nvmet: add helper to report invalid opcode
  nvmet: remove extra variable in id-ns handler
  nvmet: make nvmet_find_namespace() req based
  nvmet: return uniform error for invalid ns
  nvmet: set status to 0 in case for invalid nsid
  nvmet-fc: add a missing __rcu annotation to nvmet_fc_tgt_assoc.queues
  nvme-multipath: set nr_zones for zoned namespaces
  nvmet-tcp: fix potential race of tcp socket closing accept_work
  ...

parents 582cd91f f4b64ae6

MAINTAINERS

+0 −6

Original line number	Diff line number	Diff line
		@@ -16908,12 +16908,6 @@ F: include/linux/static_call*.h
		F: kernel/jump_label.c
		F: kernel/static_call.c

		STEC S1220 SKD DRIVER
		M: Damien Le Moal <Damien.LeMoal@wdc.com>
		L: linux-block@vger.kernel.org
		S: Maintained
		F: drivers/block/skd*[ch]

		STI AUDIO (ASoC) DRIVERS
		M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)

drivers/block/Kconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -267,16 +267,6 @@ config BLK_DEV_NBD

		If unsure, say N.

		config BLK_DEV_SKD
		tristate "STEC S1120 Block Driver"
		depends on PCI
		depends on 64BIT
		help
		Saying Y or M here will enable support for the
		STEC, Inc. S1120 PCIe SSD.

		Use device /dev/skd$N amd /dev/skd$Np$M.

		config BLK_DEV_SX8
		tristate "Promise SATA SX8 support"
		depends on PCI

drivers/block/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ obj-$(CONFIG_BLK_DEV_LOOP) += loop.o
		obj-$(CONFIG_XILINX_SYSACE) += xsysace.o
		obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o
		obj-$(CONFIG_SUNVDC) += sunvdc.o
		obj-$(CONFIG_BLK_DEV_SKD) += skd.o

		obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
		obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
		@@ -43,5 +42,4 @@ obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/

		obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/

		skd-y := skd_main.o
		swim_mod-y := swim.o swim_asm.o

drivers/block/aoe/aoecmd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1046,7 +1046,7 @@ aoe_end_request(struct aoedev d, struct request rq, int fastfail)

		__blk_mq_end_request(rq, err);

		/* cf. http://lkml.org/lkml/2006/10/31/28 */
		/* cf. https://lore.kernel.org/lkml/20061031071040.GS14055@kernel.dk/ */
		if (!fastfail)
		blk_mq_run_hw_queues(q, true);
		}

drivers/block/drbd/drbd_int.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1447,7 +1447,7 @@ extern void conn_free_crypto(struct drbd_connection *connection);

		/* drbd_req */
		extern void do_submit(struct work_struct *ws);
		extern void __drbd_make_request(struct drbd_device , struct bio , unsigned long);
		extern void __drbd_make_request(struct drbd_device , struct bio );
		extern blk_qc_t drbd_submit_bio(struct bio *bio);
		extern int drbd_read_remote(struct drbd_device device, struct drbd_request req);
		extern int is_valid_ar_handle(struct drbd_request *, sector_t);