Skip to content

Commit 237045f

Browse files
torvaldstorvalds
committed
Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block
Pull block driver updates from Jens Axboe: "This is the block driver pull request for this merge window. It sits on top of for-4.6/core, that was just sent out. This contains: - A set of fixes for lightnvm. One from Alan, fixing an overflow, and the rest from the usual suspects, Javier and Matias. - A set of fixes for nbd from Markus and Dan, and a fixup from Arnd for correct usage of the signed 64-bit divider. - A set of bug fixes for the Micron mtip32xx, from Asai. - A fix for the brd discard handling from Bart. - Update the maintainers entry for cciss, since that hardware has transferred ownership. - Three bug fixes for bcache from Eric Wheeler. - Set of fixes for xen-blk{back,front} from Jan and Konrad. - Removal of the cpqarray driver. It has been disabled in Kconfig since 2013, and we were initially scheduled to remove it in 3.15. - Various updates and fixes for NVMe, with the most important being: - Removal of the per-device NVMe thread, replacing that with a watchdog timer instead. From Christoph. - Exposing the namespace WWID through sysfs, from Keith. - Set of cleanups from Ming Lin. - Logging the controller device name instead of the underlying PCI device name, from Sagi. - And a bunch of fixes and optimizations from the usual suspects in this area" * 'for-4.6/drivers' of git://git.kernel.dk/linux-block: (49 commits) NVMe: Expose ns wwid through single sysfs entry drivers:block: cpqarray clean up brd: Fix discard request processing cpqarray: remove it from the kernel cciss: update MAINTAINERS NVMe: Remove unused sq_head read in completion path bcache: fix cache_set_flush() NULL pointer dereference on OOM bcache: cleaned up error handling around register_cache() bcache: fix race of writeback thread starting before complete initialization NVMe: Create discard zero quirk white list nbd: use correct div_s64 helper mtip32xx: remove unneeded variable in mtip_cmd_timeout() lightnvm: generalize rrpc ppa calculations lightnvm: remove struct nvm_dev->total_blocks lightnvm: rename ->nr_pages to ->nr_sects lightnvm: update closed list outside of intr context xen/blback: Fit the important information of the thread in 17 characters lightnvm: fold get bb tbl when using dual/quad plane mode lightnvm: fix up nonsensical configure overrun checking xen-blkback: advertise indirect segment support earlier ...
2 parents 35d88d9 + 118472a commit 237045f

File tree

26 files changed

+794
-3011
lines changed

26 files changed

+794
-3011
lines changed

‎Documentation/blockdev/cpqarray.txt

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎MAINTAINERS

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5016,12 +5016,6 @@ T: git git://linuxtv.org/anttip/media_tree.git
50165016
S: Maintained
50175017
F: drivers/media/dvb-frontends/hd29l2*
50185018

5019-
HEWLETT-PACKARD SMART2 RAID DRIVER
5020-
L: iss_storagedev@hp.com
5021-
S: Orphan
5022-
F: Documentation/blockdev/cpqarray.txt
5023-
F: drivers/block/cpqarray.*
5024-
50255019
HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
50265020
M: Don Brace <don.brace@microsemi.com>
50275021
L: iss_storagedev@hp.com
@@ -5034,9 +5028,9 @@ F: include/linux/cciss*.h
50345028
F: include/uapi/linux/cciss*.h
50355029

50365030
HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
5037-
M: Don Brace <don.brace@pmcs.com>
5031+
M: Don Brace <don.brace@microsemi.com>
50385032
L: iss_storagedev@hp.com
5039-
L: storagedev@pmcs.com
5033+
L: esc.storagedev@microsemi.com
50405034
L: linux-scsi@vger.kernel.org
50415035
S: Supported
50425036
F: Documentation/blockdev/cciss.txt

‎drivers/block/Kconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,6 @@ source "drivers/block/mtip32xx/Kconfig"
110110

111111
source "drivers/block/zram/Kconfig"
112112

113-
config BLK_CPQ_DA
114-
tristate "Compaq SMART2 support"
115-
depends on PCI && VIRT_TO_BUS && 0
116-
help
117-
This is the driver for Compaq Smart Array controllers. Everyone
118-
using these boards should say Y here. See the file
119-
<file:Documentation/blockdev/cpqarray.txt> for the current list of
120-
boards supported by this driver, and for further information on the
121-
use of this driver.
122-
123113
config BLK_CPQ_CISS_DA
124114
tristate "Compaq Smart Array 5xxx support"
125115
depends on PCI

‎drivers/block/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
1515
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
1616
obj-$(CONFIG_BLK_DEV_RAM) += brd.o
1717
obj-$(CONFIG_BLK_DEV_LOOP) += loop.o
18-
obj-$(CONFIG_BLK_CPQ_DA) += cpqarray.o
1918
obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o
2019
obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
2120
obj-$(CONFIG_XILINX_SYSACE) += xsysace.o

‎drivers/block/brd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio)
341341

342342
if (unlikely(bio->bi_rw & REQ_DISCARD)) {
343343
if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) ||
344-
bio->bi_iter.bi_size & PAGE_MASK)
344+
bio->bi_iter.bi_size & ~PAGE_MASK)
345345
goto io_error;
346346
discard_from_brd(brd, sector, bio->bi_iter.bi_size);
347347
goto out;

0 commit comments

Comments
 (0)