Hi Linus,
A small collection of fixes for the current kernel. This pull request
contains:
- Two error handling fixes from Jan Kara. One for null_blk on failure to
add a device, and the other for the block/scsi_ioctl
SCSI_IOCTL_SEND_COMMAND fixing up the error jump point.
- A commit added in the merge window for the bio integrity bits
unfortunately disabled merging for all requests if
CONFIG_BLK_DEV_INTEGRITY wasn't set. Reverse the logic, so that
integrity checking wont disallow merges when not enabled.
- A fix from Ming Lei for merging and generating too many segments. This
caused a BUG in virtio_blk.
- Two error handling printk() fixups from Robert Elliott, improving the
information given when we rate limit.
- Error handling fixup on elevator_init() failure from Sudip Mukherjee.
- A fix from Tony Battersby, fixing up a memory leak in the scatterlist
handling with scsi-mq.
Please pull!
git://git.kernel.dk/linux-block.git for-linus
----------------------------------------------------------------
Jan Kara (2):
null_blk: Cleanup error recovery in null_add_dev()
scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
Martin K. Petersen (1):
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
Ming Lei (1):
blk-merge: recaculate segment if it isn't less than max segments
Robert Elliott (2):
fs: merge I/O error prints into one line
fs: clarify rate limit suppressed buffer I/O errors
Sudip Mukherjee (1):
block: fix wrong error return in elevator_init()
Tony Battersby (1):
lib/scatterlist: fix memory leak with scsi-mq
block/blk-merge.c | 5 +++--
block/elevator.c | 4 +++-
block/scsi_ioctl.c | 3 +--
drivers/block/null_blk.c | 14 +++++++-------
fs/buffer.c | 38 +++++++++-----------------------------
include/linux/blkdev.h | 4 ++--
lib/scatterlist.c | 6 +++---
7 files changed, 28 insertions(+), 46 deletions(-)
--
Jens Axboe
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
