summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:46:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:46:00 -0700
commitb17b3d479c4c43c3a980ee553c3be3ca456523de (patch)
tree6715c10bfe1301eb3c112b17a858b541ce14aef5 /drivers/md
parent31582b094d640fdab3fd29237b348a4c7c8646fb (diff)
parent93769f58078e2a066b56217cae1e343ac5a6b78c (diff)
downloadop-kernel-dev-b17b3d479c4c43c3a980ee553c3be3ca456523de.zip
op-kernel-dev-b17b3d479c4c43c3a980ee553c3be3ca456523de.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: md: the bitmap code needs to use blk_plug_device_unlocked() block: add a blk_plug_device_unlocked() that grabs the queue lock
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 621a272..7e65bad 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1234,7 +1234,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
case 0:
bitmap_file_set_bit(bitmap, offset);
bitmap_count_page(bitmap,offset, 1);
- blk_plug_device(bitmap->mddev->queue);
+ blk_plug_device_unlocked(bitmap->mddev->queue);
/* fall through */
case 1:
*bmc = 2;
OpenPOWER on IntegriCloud