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

Commit d0dbc624 authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse
Browse files

Btrfs: drop owner and parentid 



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

fs/btrfs/ctree.c

+0 −8
Original line number Diff line number Diff line
@@ -688,8 +688,6 @@ static int insert_new_root(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_set_header_level(&c->header, level);

	btrfs_set_header_blocknr(&c->header, t->b_blocknr);

	btrfs_set_header_generation(&c->header, trans->transid);

	btrfs_set_header_parentid(&c->header,

	      btrfs_header_parentid(btrfs_buffer_header(root->node)));

	lower = btrfs_buffer_node(path->nodes[level-1]);

	memcpy(c->header.fsid, root->fs_info->disk_super->fsid,

	       sizeof(c->header.fsid));
@@ -784,8 +782,6 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_set_header_level(&split->header, btrfs_header_level(&c->header));

	btrfs_set_header_blocknr(&split->header, split_buffer->b_blocknr);

	btrfs_set_header_generation(&split->header, trans->transid);

	btrfs_set_header_parentid(&split->header,

	      btrfs_header_parentid(btrfs_buffer_header(root->node)));

	memcpy(split->header.fsid, root->fs_info->disk_super->fsid,

	       sizeof(split->header.fsid));

	mid = (c_nritems + 1) / 2;
@@ -1145,8 +1141,6 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_set_header_blocknr(&right->header, right_buffer->b_blocknr);

	btrfs_set_header_generation(&right->header, trans->transid);

	btrfs_set_header_level(&right->header, 0);

	btrfs_set_header_parentid(&right->header,

	      btrfs_header_parentid(btrfs_buffer_header(root->node)));

	memcpy(right->header.fsid, root->fs_info->disk_super->fsid,

	       sizeof(right->header.fsid));

	if (mid <= slot) {
@@ -1237,8 +1231,6 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_set_header_blocknr(&right->header, right_buffer->b_blocknr);

	btrfs_set_header_generation(&right->header, trans->transid);

	btrfs_set_header_level(&right->header, 0);

	btrfs_set_header_parentid(&right->header,

	      btrfs_header_parentid(btrfs_buffer_header(root->node)));

	memcpy(right->header.fsid, root->fs_info->disk_super->fsid,

	       sizeof(right->header.fsid));

	btrfs_cpu_key_to_disk(&disk_key, ins_key);

fs/btrfs/ctree.h

+1 −24
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct btrfs_header { 
	u8 fsid[16]; /* FS specific uuid */

	__le64 blocknr; /* which block this node is supposed to live in */

	__le64 generation;

	__le64 parentid; /* objectid of the tree root */

	__le16 nritems;

	__le16 flags;

	u8 level;
@@ -147,7 +146,6 @@ struct btrfs_path { 
 */

struct btrfs_extent_item {

	__le32 refs;

	__le64 owner;

} __attribute__ ((__packed__));



struct btrfs_inode_timespec {
@@ -443,16 +441,6 @@ static inline void btrfs_set_timespec_nsec(struct btrfs_inode_timespec *ts, 
	ts->nsec = cpu_to_le32(val);

}



static inline u64 btrfs_extent_owner(struct btrfs_extent_item *ei)

{

	return le64_to_cpu(ei->owner);

}



static inline void btrfs_set_extent_owner(struct btrfs_extent_item *ei, u64 val)

{

	ei->owner = cpu_to_le64(val);

}



static inline u32 btrfs_extent_refs(struct btrfs_extent_item *ei)

{

	return le32_to_cpu(ei->refs);
@@ -652,17 +640,6 @@ static inline void btrfs_set_header_generation(struct btrfs_header *h, 
	h->generation = cpu_to_le64(val);

}



static inline u64 btrfs_header_parentid(struct btrfs_header *h)

{

	return le64_to_cpu(h->parentid);

}



static inline void btrfs_set_header_parentid(struct btrfs_header *h,

					     u64 parentid)

{

	h->parentid = cpu_to_le64(parentid);

}



static inline u16 btrfs_header_nritems(struct btrfs_header *h)

{

	return le16_to_cpu(h->nritems);
@@ -919,7 +896,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, 
					    struct btrfs_root *root);

int btrfs_alloc_extent(struct btrfs_trans_handle *trans, struct btrfs_root

			*root, u64 num_blocks, u64 search_start, u64

			search_end, u64 owner, struct btrfs_key *ins);

			search_end, struct btrfs_key *ins);

int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		  struct buffer_head *buf);

int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root

fs/btrfs/extent-tree.c

+2 −6
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct 
	struct btrfs_fs_info *info = extent_root->fs_info;



	btrfs_set_extent_refs(&extent_item, 1);

	btrfs_set_extent_owner(&extent_item,

		btrfs_header_parentid(btrfs_buffer_header(extent_root->node)));

	ins.offset = 1;

	ins.flags = 0;

	btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY);
@@ -457,7 +455,7 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root 
 */

int btrfs_alloc_extent(struct btrfs_trans_handle *trans, struct btrfs_root

			*root, u64 num_blocks, u64 search_start, u64

			search_end, u64 owner, struct btrfs_key *ins)

			search_end, struct btrfs_key *ins)

{

	int ret;

	int pending_ret;
@@ -467,7 +465,6 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans, struct btrfs_root 
	struct btrfs_extent_item extent_item;



	btrfs_set_extent_refs(&extent_item, 1);

	btrfs_set_extent_owner(&extent_item, owner);



	if (root == extent_root) {

		BUG_ON(extent_root->fs_info->current_insert.offset == 0);
@@ -510,8 +507,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, 
	int ret;

	struct buffer_head *buf;



	ret = btrfs_alloc_extent(trans, root, 1, 0, (unsigned long)-1,

		btrfs_header_parentid(btrfs_buffer_header(root->node)), &ins);

	ret = btrfs_alloc_extent(trans, root, 1, 0, (unsigned long)-1, &ins);

	if (ret) {

		BUG();

		return NULL;

fs/btrfs/file-item.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans, 
	BUG_ON(!path);

	btrfs_init_path(path);

	ret = btrfs_alloc_extent(trans, root, num_blocks, hint_block,

				 (u64)-1, objectid, &ins);

				 (u64)-1, &ins);

	BUG_ON(ret);

	file_key.objectid = objectid;

	file_key.offset = offset;

fs/btrfs/print-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l) 
			break;

		case BTRFS_EXTENT_ITEM_KEY:

			ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);

			printk("\t\textent data refs %u owner %Lu\n",

				btrfs_extent_refs(ei), btrfs_extent_owner(ei));

			printk("\t\textent data refs %u\n",

				btrfs_extent_refs(ei));

			break;

		case BTRFS_STRING_ITEM_KEY:

			printk("\t\titem data %.*s\n", btrfs_item_size(item),