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

Commit b83ae6d4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

fs: remove mapping->backing_dev_info 



Now that we never use the backing_dev_info pointer in struct address_space
we can simply remove it and save 4 to 8 bytes in every inode.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Reviewed-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent de1414a6

drivers/char/raw.c

+1 −3
Original line number Diff line number Diff line
@@ -104,11 +104,9 @@ static int raw_release(struct inode *inode, struct file *filp) 


	mutex_lock(&raw_mutex);

	bdev = raw_devices[minor].binding;

	if (--raw_devices[minor].inuse == 0) {

	if (--raw_devices[minor].inuse == 0)

		/* Here  inode->i_mapping == bdev->bd_inode->i_mapping  */

		inode->i_mapping = &inode->i_data;

		inode->i_mapping->backing_dev_info = &default_backing_dev_info;

	}

	mutex_unlock(&raw_mutex);



	blkdev_put(bdev, filp->f_mode | FMODE_EXCL);

fs/aio.c

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages) 


	inode->i_mapping->a_ops = &aio_ctx_aops;

	inode->i_mapping->private_data = ctx;

	inode->i_mapping->backing_dev_info = &noop_backing_dev_info;

	inode->i_size = PAGE_SIZE * nr_pages;



	path.dentry = d_alloc_pseudo(aio_mnt->mnt_sb, &this);

fs/block_dev.c

+1 −25
Original line number Diff line number Diff line
@@ -60,19 +60,6 @@ static void bdev_write_inode(struct inode *inode) 
	spin_unlock(&inode->i_lock);

}



/*

 * Move the inode from its current bdi to a new bdi.  Make sure the inode

 * is clean before moving so that it doesn't linger on the old bdi.

 */

static void bdev_inode_switch_bdi(struct inode *inode,

			struct backing_dev_info *dst)

{

	spin_lock(&inode->i_lock);

	WARN_ON_ONCE(inode->i_state & I_DIRTY);

	inode->i_data.backing_dev_info = dst;

	spin_unlock(&inode->i_lock);

}



/* Kill _all_ buffers and pagecache , dirty or not.. */

void kill_bdev(struct block_device *bdev)

{
@@ -589,7 +576,6 @@ struct block_device *bdget(dev_t dev) 
		inode->i_bdev = bdev;

		inode->i_data.a_ops = &def_blk_aops;

		mapping_set_gfp_mask(&inode->i_data, GFP_USER);

		inode->i_data.backing_dev_info = &default_backing_dev_info;

		spin_lock(&bdev_lock);

		list_add(&bdev->bd_list, &all_bdevs);

		spin_unlock(&bdev_lock);
@@ -1150,8 +1136,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
		bdev->bd_queue = disk->queue;

		bdev->bd_contains = bdev;

		if (!partno) {

			struct backing_dev_info *bdi;



			ret = -ENXIO;

			bdev->bd_part = disk_get_part(disk, partno);

			if (!bdev->bd_part)
@@ -1177,11 +1161,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
				}

			}



			if (!ret) {

			if (!ret)

				bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);

				bdi = blk_get_backing_dev_info(bdev);

				bdev_inode_switch_bdi(bdev->bd_inode, bdi);

			}



			/*

			 * If the device is invalidated, rescan partition
@@ -1208,8 +1189,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
			if (ret)

				goto out_clear;

			bdev->bd_contains = whole;

			bdev_inode_switch_bdi(bdev->bd_inode,

				whole->bd_inode->i_data.backing_dev_info);

			bdev->bd_part = disk_get_part(disk, partno);

			if (!(disk->flags & GENHD_FL_UP) ||

			    !bdev->bd_part || !bdev->bd_part->nr_sects) {
@@ -1249,7 +1228,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
	bdev->bd_disk = NULL;

	bdev->bd_part = NULL;

	bdev->bd_queue = NULL;

	bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);

	if (bdev != bdev->bd_contains)

		__blkdev_put(bdev->bd_contains, mode, 1);

	bdev->bd_contains = NULL;
@@ -1474,8 +1452,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) 
		 * dirty data before.

		 */

		bdev_write_inode(bdev->bd_inode);

		bdev_inode_switch_bdi(bdev->bd_inode,

					&default_backing_dev_info);

	}

	if (bdev->bd_contains == bdev) {

		if (disk->fops->release)

fs/btrfs/disk-io.c

+0 −1
Original line number Diff line number Diff line
@@ -2318,7 +2318,6 @@ int open_ctree(struct super_block *sb, 
	 */

	fs_info->btree_inode->i_size = OFFSET_MAX;

	fs_info->btree_inode->i_mapping->a_ops = &btree_aops;

	fs_info->btree_inode->i_mapping->backing_dev_info = &fs_info->bdi;



	RB_CLEAR_NODE(&BTRFS_I(fs_info->btree_inode)->rb_node);

	extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree,

fs/btrfs/inode.c

+0 −6
Original line number Diff line number Diff line
@@ -3608,7 +3608,6 @@ static void btrfs_read_locked_inode(struct inode *inode) 
	switch (inode->i_mode & S_IFMT) {

	case S_IFREG:

		inode->i_mapping->a_ops = &btrfs_aops;

		inode->i_mapping->backing_dev_info = &root->fs_info->bdi;

		BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;

		inode->i_fop = &btrfs_file_operations;

		inode->i_op = &btrfs_file_inode_operations;
@@ -3623,7 +3622,6 @@ static void btrfs_read_locked_inode(struct inode *inode) 
	case S_IFLNK:

		inode->i_op = &btrfs_symlink_inode_operations;

		inode->i_mapping->a_ops = &btrfs_symlink_aops;

		inode->i_mapping->backing_dev_info = &root->fs_info->bdi;

		break;

	default:

		inode->i_op = &btrfs_special_inode_operations;
@@ -6088,7 +6086,6 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
	inode->i_fop = &btrfs_file_operations;

	inode->i_op = &btrfs_file_inode_operations;

	inode->i_mapping->a_ops = &btrfs_aops;

	inode->i_mapping->backing_dev_info = &root->fs_info->bdi;



	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);

	if (err)
@@ -9203,7 +9200,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
	inode->i_fop = &btrfs_file_operations;

	inode->i_op = &btrfs_file_inode_operations;

	inode->i_mapping->a_ops = &btrfs_aops;

	inode->i_mapping->backing_dev_info = &root->fs_info->bdi;

	BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;



	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
@@ -9247,7 +9243,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 


	inode->i_op = &btrfs_symlink_inode_operations;

	inode->i_mapping->a_ops = &btrfs_symlink_aops;

	inode->i_mapping->backing_dev_info = &root->fs_info->bdi;

	inode_set_bytes(inode, name_len);

	btrfs_i_size_write(inode, name_len);

	err = btrfs_update_inode(trans, root, inode);
@@ -9459,7 +9454,6 @@ static int btrfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 
	inode->i_op = &btrfs_file_inode_operations;



	inode->i_mapping->a_ops = &btrfs_aops;

	inode->i_mapping->backing_dev_info = &root->fs_info->bdi;

	BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;



	ret = btrfs_init_inode_security(trans, inode, dir, NULL);