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

Commit f1ace244 authored by Aneesh's avatar Aneesh Committed by David Woodhouse
Browse files

btrfs: Code cleanup 


Attaching below is some of the code cleanups that i came across while
reading the code.

a) alloc_path already calls init_path.
b) Mention that btrfs_inode is the in memory copy.Ext4 have ext4_inode_info as
the in memory copy ext4_inode as the disk copy

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent b79ab950

fs/btrfs/btrfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifndef __BTRFS_I__

#define __BTRFS_I__



/* in memory btrfs inode */

struct btrfs_inode {

	struct btrfs_root *root;

	struct btrfs_block_group_cache *block_group;

fs/btrfs/ctree.c

+0 −1
Original line number Diff line number Diff line
@@ -1647,7 +1647,6 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root 


	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);

	ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);

	if (!ret) {

		ptr = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),

fs/btrfs/dir-item.c

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	ret = btrfs_name_hash(name, name_len, &key.offset);

	BUG_ON(ret);

	path = btrfs_alloc_path();

	btrfs_init_path(path);

	data_size = sizeof(*dir_item) + name_len;

	dir_item = insert_with_overflow(trans, root, path, &key, data_size,

					name, name_len);

fs/btrfs/extent-tree.c

+0 −4
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
			 &ins, 0);

	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);

	key.objectid = blocknr;

	key.flags = 0;

	btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
@@ -437,7 +436,6 @@ static int lookup_extent_ref(struct btrfs_trans_handle *trans, 
	struct btrfs_extent_item *item;



	path = btrfs_alloc_path();

	btrfs_init_path(path);

	key.objectid = blocknr;

	key.offset = num_blocks;

	key.flags = 0;
@@ -807,7 +805,6 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root 
	find_free_extent(trans, root, 0, 0, (u64)-1, 0, &ins, 0);

	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);



	ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);

	if (ret) {
@@ -1463,7 +1460,6 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root 


	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);



	level = btrfs_header_level(btrfs_buffer_header(snap));

	orig_level = level;

fs/btrfs/file-item.c

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, 


	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);

	file_key.objectid = objectid;

	file_key.offset = pos;

	file_key.flags = 0;
@@ -274,7 +273,6 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root, 


	path = btrfs_alloc_path();

	BUG_ON(!path);

	btrfs_init_path(path);

	file_key.objectid = objectid;

	file_key.offset = offset;

	file_key.flags = 0;