Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] device-mapper: fix deadlocks in core

Browse source 
Avoid another bdget_disk which can deadlock.

Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alasdair G Kergon 2005-07-28 21:15:59 -07:00 • committed by Linus Torvalds
parent cf222b3769
commit 4e90188be4
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/md/dm.c
View file

@ -825,18 +825,13 @@ static void event_callback(void *context)
wake_up(&md->eventq); 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); down(&md->frozen_bdev->bd_inode->i_sem);
bdev = bdget_disk(disk, 0); i_size_write(md->frozen_bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
if (bdev) { up(&md->frozen_bdev->bd_inode->i_sem);
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);
}
} }
static int __bind(struct mapped_device *md, struct dm_table *t) static int __bind(struct mapped_device *md, struct dm_table *t)
@ -845,7 +840,7 @@ static int __bind(struct mapped_device *md, struct dm_table *t)
sector_t size; sector_t size;
size = dm_table_get_size(t); size = dm_table_get_size(t);
__set_size(md->disk, size); __set_size(md, size);
if (size == 0) if (size == 0)
return 0; return 0;