[GIT PULL] Block bits for 3.0-rc2
From: Jens Axboe
Date: Fri Jun 03 2011 - 15:41:08 EST
Hi Linus,
A collection of smallish fixes for -rc2.
- One bio documentation improvement, that I see Al already pushed out.
Should be identical, if not I'm sure you are up to the merge.
- Two bug fixes for the XEN blkback driver.
- A revert of a patch that caused a regression in sysfs discard
alignment display.
- Further patches from Namhyung Kim, giving nbd the same fixup treatment
for max_part oopsable conditions. Also fixes an ancient bug in there
were the recvmsg() flags aren't correctly passed in.
- Two fixes from Paul Bolle, removing an if that was always false and
correcting usage of list_entry() to hlist_entry() (cosmetical).
- A blkdev_get() fixup from Tejun.
Please pull.
git://git.kernel.dk/linux-block.git for-linus
Andreas Gruenbacher (1):
block: improve the bio_add_page() and bio_add_pc_page() descriptions
Dan Carpenter (1):
xen/blkback: potential null dereference in error handling
Jens Axboe (2):
Revert "block: Remove extra discard_alignment from hd_struct."
Merge branch 'for-jens/xen-blkback.fixes' of git://git.kernel.org/.../konrad/xen into for-linus
Kyungmin Park (1):
CFQ: Fix typo and remove unnecessary semicolon
Laszlo Ersek (1):
xen/blkback: don't call vbd_size() if bd_disk is NULL
Namhyung Kim (4):
nbd: pass MSG_* flags to kernel_recvmsg()
nbd: limit module parameters to a sane value
nbd: adjust 'max_part' according to part_shift
block: remove unwanted semicolons
Paul Bolle (2):
cfq-iosched: Remove bogus check in queue_fail path
block: Use hlist_entry() for io_context.cic_list.first
Tejun Heo (1):
block: blkdev_get() should access ->bd_disk only after success
block/blk-ioc.c | 4 ++--
block/cfq-iosched.c | 11 ++++-------
drivers/block/nbd.c | 22 ++++++++++++++++++++--
drivers/block/xen-blkback/blkback.c | 10 ++++++----
drivers/block/xen-blkback/xenbus.c | 3 +--
fs/bio.c | 16 ++++++++--------
fs/block_dev.c | 4 ++--
fs/partitions/check.c | 10 +++-------
include/linux/blkdev.h | 4 ++--
include/linux/genhd.h | 1 +
10 files changed, 49 insertions(+), 36 deletions(-)
--
Jens Axboe
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/