Skip to contentSkip to conversation

Important block fixes for 3.0-rc

GIT PULL Jens Axboe 1 participant 1 message Jul 7, 2011

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Two parts to this:

- Silencing an RCU warning introduced with the commit fixing the long standing CFQ crash.

- A handful of bug fixes for drbd.

Please pull.

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

Jens Axboe (1):
Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

Lars Ellenberg (6):
drbd: add missing spinlock to bitmap receive
drbd: don't cond_resched_lock with IRQs disabled
drbd: account bitmap IO during resync as resync-(related-)-io
drbd: when receive times out on meta socket, also check last receive time on data socket
drbd: fix limit define, we support 1 PiByte now
drbd: we should write meta data updates with FLUSH FUA

Philipp Reisner (1):
drbd: Use the correct max_bio_size when creating resync requests

Shaohua Li (2):
cfq-iosched: fix a rcu warning
cfq-iosched: make code consistent

 block/cfq-iosched.c                |    8 +++++-
 drivers/block/drbd/drbd_actlog.c   |    2 +-
 drivers/block/drbd/drbd_bitmap.c   |   37 ++++++++++++++++++++++-------------
 drivers/block/drbd/drbd_receiver.c |    6 +++++
 drivers/block/drbd/drbd_worker.c   |    7 +-----
 include/linux/drbd_limits.h        |    4 +-
 6 files changed, 39 insertions(+), 25 deletions(-)
Signature · 1 line
Jens Axboe