From: Jens Axboe <axboe@fb.com>
To: <torvalds@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Block fixes for 3.18-rc2
Date: Wed, 29 Oct 2014 09:20:40 -0600 [thread overview]
Message-ID: <20141029152040.GA5277@kernel.dk> (raw)
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
reply other threads:[~2014-10-29 15:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141029152040.GA5277@kernel.dk \
--to=axboe@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.