diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 13:32:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 13:32:07 -0800 |
| commit | 6ab82196492a0b6968a654a06aae923b28afef0d (patch) | |
| tree | 8affe1097bba194fe677d5399f47693dc0363dd8 /drivers | |
| parent | Turn d_set_d_op() BUG_ON() into WARN_ON_ONCE() (diff) | |
| parent | block: restore multiple bd_link_disk_holder() support (diff) | |
| download | linux-dev-6ab82196492a0b6968a654a06aae923b28afef0d.tar.xz linux-dev-6ab82196492a0b6968a654a06aae923b28afef0d.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:
block: restore multiple bd_link_disk_holder() support
block cfq: compensate preempted queue even if it has no slice assigned
block cfq: make queue preempt work for queues from different workload
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-table.c | 1 | ||||
| -rw-r--r-- | drivers/md/md.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index dffa0ac7c4f0..38e4eb1bb965 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -350,6 +350,7 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md) if (!d->dm_dev.bdev) return; + bd_unlink_disk_holder(d->dm_dev.bdev, dm_disk(md)); blkdev_put(d->dm_dev.bdev, d->dm_dev.mode | FMODE_EXCL); d->dm_dev.bdev = NULL; } diff --git a/drivers/md/md.c b/drivers/md/md.c index cf8594c5ea21..b76cfc89e1b5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1912,6 +1912,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev) MD_BUG(); return; } + bd_unlink_disk_holder(rdev->bdev, rdev->mddev->gendisk); list_del_rcu(&rdev->same_set); printk(KERN_INFO "md: unbind<%s>\n", bdevname(rdev->bdev,b)); rdev->mddev = NULL; |