From: Alasdair G Kergon <agk@redhat.com>
Avoid another bdget_disk which can deadlock.
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/md/dm.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff -puN drivers/md/dm.c~device-mapper-fix-deadlocks-in-core drivers/md/dm.c
--- devel/drivers/md/dm.c~device-mapper-fix-deadlocks-in-core 2005-07-26 00:38:50.000000000 -0700
+++ devel-akpm/drivers/md/dm.c 2005-07-26 00:38:50.000000000 -0700
@@ -831,18 +831,13 @@ static void event_callback(void *context
wake_up(&md->eventq);
}
-static void __set_size(struct gendisk *disk, sector_t size)
+static void __set_size(struct mapped_device *md, sector_t size)
{
- struct block_device *bdev;
+ set_capacity(md->disk, size);
- set_capacity(disk, size);
- bdev = bdget_disk(disk, 0);
- if (bdev) {
- down(&bdev->bd_inode->i_sem);
- i_size_write(bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
- up(&bdev->bd_inode->i_sem);
- bdput(bdev);
- }
+ down(&md->frozen_bdev->bd_inode->i_sem);
+ i_size_write(md->frozen_bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
+ up(&md->frozen_bdev->bd_inode->i_sem);
}
static int __bind(struct mapped_device *md, struct dm_table *t)
@@ -851,7 +846,7 @@ static int __bind(struct mapped_device *
sector_t size;
size = dm_table_get_size(t);
- __set_size(md->disk, size);
+ __set_size(md, size);
if (size == 0)
return 0;
_