Skip to contentSkip to conversation

Two small fixes for 2.6.34

GIT PULL Jens Axboe 1 participant 2 messages May 7, 2010

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Two small fixes for 2.6.34. One fixes a typo in drbd, and the other fixes a missing RCU lock in the block cgroup code. Please pull.

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

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

Lars Ellenberg (1):
drbd: don't expose failed local READ to upper layers

Vivek Goyal (1):
blk-cgroup: Fix RCU correctness warning in cfq_init_queue()

 block/cfq-iosched.c              |    2 ++
 drivers/block/drbd/drbd_worker.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
Signature · 1 line
Jens Axboe
author
#1 lore raw
Quoted 14 lines · Jens Axboe

Hi Linus,

Two small fixes for 2.6.34. One fixes a typo in drbd, and the other fixes a missing RCU lock in the block cgroup code. Please pull.

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

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

Lars Ellenberg (1):
drbd: don't expose failed local READ to upper layers

Quoted 6 lines

Vivek Goyal (1):
blk-cgroup: Fix RCU correctness warning in cfq_init_queue()

 block/cfq-iosched.c              |    2 ++
 drivers/block/drbd/drbd_worker.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

Another small RCU block cgroup fix was missed, I've pushed that out now. New changelog/diffstat:

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

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

Lars Ellenberg (1):
drbd: don't expose failed local READ to upper layers

Li Zefan (1):
blk-cgroup: Fix an RCU warning in blkiocg_create()

Vivek Goyal (1):
blk-cgroup: Fix RCU correctness warning in cfq_init_queue()

 block/blk-cgroup.c               |    8 ++++----
 block/cfq-iosched.c              |    2 ++
 drivers/block/drbd/drbd_worker.c |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
Jens Axboe