korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 00:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

dm: remove the block_device reference in struct mapped_device

Browse Source 
Get rid of the long-lasting struct block_device reference in
struct mapped_device.  The only remaining user is the freeze code,
where we can trivially look up the block device at freeze time
and release the reference at thaw time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-11-27 16:21:42 +01:00 committed by Jens Axboe
parent 47d951023a
commit b0519b5423
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/dm-core.h
View File

@ -102,8 +102,6 @@ struct mapped_device {
/* kobject and completion */
struct dm_kobject_holder kobj_holder;
struct block_device *bdev;
struct dm_stats stats;
/* for blk-mq request-based DM support */

25
drivers/md/dm.c
View File

@ -1744,11 +1744,6 @@ static void cleanup_mapped_device(struct mapped_device *md)
cleanup_srcu_struct(&md->io_barrier);
if (md->bdev) {
bdput(md->bdev);
md->bdev = NULL;
}
mutex_destroy(&md->suspend_lock);
mutex_destroy(&md->type_lock);
mutex_destroy(&md->table_devices_lock);
@ -1840,10 +1835,6 @@ static struct mapped_device *alloc_dev(int minor)
if (!md->wq)
goto bad;
md->bdev = bdget_disk(md->disk, 0);
if (!md->bdev)
goto bad;
dm_stats_init(&md->stats);
/* Populate the mapping, nobody knows we exist yet */
@ -2384,11 +2375,16 @@ out:
*/
static int lock_fs(struct mapped_device *md)
{
struct block_device *bdev;
int r;
WARN_ON(test_bit(DMF_FROZEN, &md->flags));
r = freeze_bdev(md->bdev);
bdev = bdget_disk(md->disk, 0);
if (!bdev)
return -ENOMEM;
r = freeze_bdev(bdev);
bdput(bdev);
if (!r)
set_bit(DMF_FROZEN, &md->flags);
return r;
@ -2396,9 +2392,16 @@ static int lock_fs(struct mapped_device *md)
static void unlock_fs(struct mapped_device *md)
{
struct block_device *bdev;
if (!test_bit(DMF_FROZEN, &md->flags))
return;
thaw_bdev(md->bdev);
bdev = bdget_disk(md->disk, 0);
if (!bdev)
return;
thaw_bdev(bdev);
bdput(bdev);
clear_bit(DMF_FROZEN, &md->flags);
}