Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit badf0683 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Initialize bd_bdi on inode initialization"

parents 6e4b5af7 3385bb13

fs/block_dev.c

+4 −2
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ static void init_once(void *foo) 
#ifdef CONFIG_SYSFS

	INIT_LIST_HEAD(&bdev->bd_holder_disks);

#endif

	bdev->bd_bdi = &noop_backing_dev_info;

	inode_init_once(&ei->vfs_inode);

	/* Initialize mutex for freeze. */

	mutex_init(&bdev->bd_fsfreeze_mutex);
@@ -628,8 +629,10 @@ static void bdev_evict_inode(struct inode *inode) 
	spin_lock(&bdev_lock);

	list_del_init(&bdev->bd_list);

	spin_unlock(&bdev_lock);

	if (bdev->bd_bdi != &noop_backing_dev_info)

	if (bdev->bd_bdi != &noop_backing_dev_info) {

		bdi_put(bdev->bd_bdi);

		bdev->bd_bdi = &noop_backing_dev_info;

	}

}



static const struct super_operations bdev_sops = {
@@ -732,7 +735,6 @@ struct block_device *bdget(dev_t dev) 
		bdev->bd_contains = NULL;

		bdev->bd_super = NULL;

		bdev->bd_inode = inode;

		bdev->bd_bdi = &noop_backing_dev_info;

		bdev->bd_block_size = i_blocksize(inode);

		bdev->bd_part_count = 0;

		bdev->bd_invalidated = 0;