Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: initialize struct block_device in bdev_alloc

Browse Source 
Don't play tricks with slab constructors as bdev structures tends to not
get reused very much, and this makes the code a lot less error prone.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-11-23 15:41:40 +01:00 committed by Jens Axboe
parent c64dc3bd87
commit e6cb53827e
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/block_dev.c
View File

@ -784,20 +784,11 @@ static void bdev_free_inode(struct inode *inode)
kmem_cache_free(bdev_cachep, BDEV_I(inode)); kmem_cache_free(bdev_cachep, BDEV_I(inode));
} }
static void init_once(void *foo) static void init_once(void *data)
{ {
struct bdev_inode *ei = (struct bdev_inode *) foo; struct bdev_inode *ei = data;
struct block_device *bdev = &ei->bdev;
memset(bdev, 0, sizeof(*bdev));
mutex_init(&bdev->bd_mutex);
#ifdef CONFIG_SYSFS
INIT_LIST_HEAD(&bdev->bd_holder_disks);
#endif
bdev->bd_bdi = &noop_backing_dev_info;
inode_init_once(&ei->vfs_inode); inode_init_once(&ei->vfs_inode);
/* Initialize mutex for freeze. */
mutex_init(&bdev->bd_fsfreeze_mutex);
} }
static void bdev_evict_inode(struct inode *inode) static void bdev_evict_inode(struct inode *inode)
@ -873,12 +864,17 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
mapping_set_gfp_mask(&inode->i_data, GFP_USER); mapping_set_gfp_mask(&inode->i_data, GFP_USER);
bdev = I_BDEV(inode); bdev = I_BDEV(inode);
memset(bdev, 0, sizeof(*bdev));
mutex_init(&bdev->bd_mutex);
mutex_init(&bdev->bd_fsfreeze_mutex);
spin_lock_init(&bdev->bd_size_lock); spin_lock_init(&bdev->bd_size_lock);
bdev->bd_disk = disk; bdev->bd_disk = disk;
bdev->bd_partno = partno; bdev->bd_partno = partno;
bdev->bd_super = NULL;
bdev->bd_inode = inode; bdev->bd_inode = inode;
bdev->bd_part_count = 0; bdev->bd_bdi = &noop_backing_dev_info;
#ifdef CONFIG_SYSFS
INIT_LIST_HEAD(&bdev->bd_holder_disks);
#endif
return bdev; return bdev;
} }