Commit 905eb88b authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: remove struct extent_io_ops 



It's no longer used just remove the function and any related code which
was initialising it for inodes. No functional changes.

Removing 8 bytes from extent_io_tree in turn reduces size of other
structures where it is embedded, notably btrfs_inode where it reduces
size by 24 bytes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1b36294a

fs/btrfs/ctree.h

+0 −2
Original line number Diff line number Diff line
@@ -3583,9 +3583,7 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) 


/* Sanity test specific functions */

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

void btrfs_test_inode_set_ops(struct inode *inode);

void btrfs_test_destroy_inode(struct inode *inode);



static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)

{

	return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state);

fs/btrfs/disk-io.c

+0 −7
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
				 BTRFS_SUPER_FLAG_METADUMP |\

				 BTRFS_SUPER_FLAG_METADUMP_V2)



static const struct extent_io_ops btree_extent_io_ops;

static void end_workqueue_fn(struct btrfs_work *work);

static void btrfs_destroy_ordered_extents(struct btrfs_root *root);

static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
@@ -2065,8 +2064,6 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info) 
	BTRFS_I(inode)->io_tree.track_uptodate = false;

	extent_map_tree_init(&BTRFS_I(inode)->extent_tree);



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



	BTRFS_I(inode)->root = btrfs_grab_root(fs_info->tree_root);

	memset(&BTRFS_I(inode)->location, 0, sizeof(struct btrfs_key));

	set_bit(BTRFS_INODE_DUMMY, &BTRFS_I(inode)->runtime_flags);
@@ -4633,7 +4630,3 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info) 


	return 0;

}
 


static const struct extent_io_ops btree_extent_io_ops = {

	.submit_bio_hook = NULL

};

fs/btrfs/extent-io-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct extent_io_tree { 
	u8 owner;



	spinlock_t lock;

	const struct extent_io_ops *ops;

};



struct extent_state {

fs/btrfs/extent_io.c

+0 −2
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ void extent_io_tree_init(struct btrfs_fs_info *fs_info, 
{

	tree->fs_info = fs_info;

	tree->state = RB_ROOT;

	tree->ops = NULL;

	tree->dirty_bytes = 0;

	spin_lock_init(&tree->lock);

	tree->private_data = private_data;
@@ -3055,7 +3054,6 @@ static int submit_extent_page(unsigned int opf, 
		else

			contig = bio_end_sector(bio) == sector;



		ASSERT(tree->ops);

		if (btrfs_bio_fits_in_stripe(page, page_size, bio, bio_flags))

			can_merge = false;

fs/btrfs/extent_io.h

+0 −9
Original line number Diff line number Diff line
@@ -74,15 +74,6 @@ typedef blk_status_t (submit_bio_hook_t)(struct inode *inode, struct bio *bio, 
typedef blk_status_t (extent_submit_bio_start_t)(void *private_data,

		struct bio *bio, u64 bio_offset);



struct extent_io_ops {

	/*

	 * The following callback must be always defined, the function

	 * pointer will be called unconditionally.

	 */

	submit_bio_hook_t *submit_bio_hook;

};





#define INLINE_EXTENT_BUFFER_PAGES 16

#define MAX_INLINE_EXTENT_BUFFER_SIZE (INLINE_EXTENT_BUFFER_PAGES * PAGE_SIZE)

struct extent_buffer {

CRA Git | Maintained and supported by SUSTech CRA and CCSE