2010-11-25 08:07:10

by Jens Axboe

[permalink] [raw]
Subject: [GIT PULL] block bits for 2.6.37-rc3

Hi Linus,

The "big" part here is the xen/blkfront transition to a
functional barrier replacement setup. Other than that,
a few fixes for build warnings/breaks, one more RCU fix
for the ioprio code, and a fix for a bug in the
blk-throttle code.

Please pull.

git://git.kernel.dk/linux-2.6-block.git for-linus

Greg Thelen (1):
ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()

Jens Axboe (2):
Merge branch 'upstream/blkfront' of git://git.kernel.org/.../jeremy/xen into for-linus
cciss: fix build for PROC_FS disabled

Jeremy Fitzhardinge (4):
xen/blkfront: map REQ_FLUSH into a full barrier
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests

Vivek Goyal (2):
blk-throttle: Fix calculation of max number of WRITES to be dispatched
block: fix amiga and atari floppy driver compile warning

block/blk-throttle.c | 2 +-
drivers/block/amiflop.c | 2 +-
drivers/block/ataflop.c | 2 +-
drivers/block/cciss.c | 3 +-
drivers/block/xen-blkfront.c | 55 +++++++++++++++++++++++++----------------
fs/ioprio.c | 31 ++++-------------------
6 files changed, 43 insertions(+), 52 deletions(-)

--
Jens Axboe