diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 15:17:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 15:17:49 -0800 |
| commit | 4c31c30302358ce1d253f915a064722db33c2114 (patch) | |
| tree | f592738f7d3f1ed1640f28db6c2b987fc826ba65 /drivers/md/bitmap.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| parent | Add UNPLUG traces to all appropriate places (diff) | |
| download | linux-dev-4c31c30302358ce1d253f915a064722db33c2114.tar.xz linux-dev-4c31c30302358ce1d253f915a064722db33c2114.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Add UNPLUG traces to all appropriate places
block: fix requeue handling in blk_queue_invalidate_tags()
mmc: Fix sg helper copy-and-paste error
pktcdvd: fix BUG caused by sysfs module reference semantics change
ioprio: allow sys_ioprio_set() value of 0 to reset ioprio setting
cfq_idle_class_timer: add paranoid checks for jiffies overflow
cfq: fix IOPRIO_CLASS_IDLE delays
cfq: fix IOPRIO_CLASS_IDLE accounting
Diffstat (limited to 'drivers/md/bitmap.c')
| -rw-r--r-- | drivers/md/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 7c426d07a555..1b1ef3130e6e 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1207,8 +1207,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect prepare_to_wait(&bitmap->overflow_wait, &__wait, TASK_UNINTERRUPTIBLE); spin_unlock_irq(&bitmap->lock); - bitmap->mddev->queue - ->unplug_fn(bitmap->mddev->queue); + blk_unplug(bitmap->mddev->queue); schedule(); finish_wait(&bitmap->overflow_wait, &__wait); continue; |