Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration (9785dbdf) · Commits · e / devices / android_kernel_fairphone_FP3

fs/btrfs/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,6 +8,6 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
		extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
		export.o tree-log.o free-space-cache.o zlib.o lzo.o \
		compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \
		reada.o backref.o
		reada.o backref.o ulist.o

		btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

fs/btrfs/backref.c

+878 −253

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/backref.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#define __BTRFS_BACKREF__

		#include "ioctl.h"
		#include "ulist.h"

		struct inode_fs_paths {
		struct btrfs_path *btrfs_path;
		@@ -54,6 +55,10 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,

		int paths_from_inode(u64 inum, struct inode_fs_paths *ipath);

		int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info, u64 bytenr,
		u64 num_bytes, u64 seq, struct ulist **roots);

		struct btrfs_data_container *init_data_container(u32 total_bytes);
		struct inode_fs_paths init_ipath(s32 total_bytes, struct btrfs_root fs_root,
		struct btrfs_path *path);

fs/btrfs/ctree.c

+21 −21

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,

		cow = btrfs_alloc_free_block(trans, root, buf->len, 0,
		new_root_objectid, &disk_key, level,
		buf->start, 0);
		buf->start, 0, 1);
		if (IS_ERR(cow))
		return PTR_ERR(cow);

		@@ -261,9 +261,9 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,

		WARN_ON(btrfs_header_generation(buf) > trans->transid);
		if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID)
		ret = btrfs_inc_ref(trans, root, cow, 1);
		ret = btrfs_inc_ref(trans, root, cow, 1, 1);
		else
		ret = btrfs_inc_ref(trans, root, cow, 0);
		ret = btrfs_inc_ref(trans, root, cow, 0, 1);

		if (ret)
		return ret;
		@@ -350,14 +350,14 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
		if ((owner == root->root_key.objectid \|\|
		root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &&
		!(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)) {
		ret = btrfs_inc_ref(trans, root, buf, 1);
		ret = btrfs_inc_ref(trans, root, buf, 1, 1);
		BUG_ON(ret);

		if (root->root_key.objectid ==
		BTRFS_TREE_RELOC_OBJECTID) {
		ret = btrfs_dec_ref(trans, root, buf, 0);
		ret = btrfs_dec_ref(trans, root, buf, 0, 1);
		BUG_ON(ret);
		ret = btrfs_inc_ref(trans, root, cow, 1);
		ret = btrfs_inc_ref(trans, root, cow, 1, 1);
		BUG_ON(ret);
		}
		new_flags \|= BTRFS_BLOCK_FLAG_FULL_BACKREF;
		@@ -365,9 +365,9 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,

		if (root->root_key.objectid ==
		BTRFS_TREE_RELOC_OBJECTID)
		ret = btrfs_inc_ref(trans, root, cow, 1);
		ret = btrfs_inc_ref(trans, root, cow, 1, 1);
		else
		ret = btrfs_inc_ref(trans, root, cow, 0);
		ret = btrfs_inc_ref(trans, root, cow, 0, 1);
		BUG_ON(ret);
		}
		if (new_flags != 0) {
		@@ -381,11 +381,11 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
		if (flags & BTRFS_BLOCK_FLAG_FULL_BACKREF) {
		if (root->root_key.objectid ==
		BTRFS_TREE_RELOC_OBJECTID)
		ret = btrfs_inc_ref(trans, root, cow, 1);
		ret = btrfs_inc_ref(trans, root, cow, 1, 1);
		else
		ret = btrfs_inc_ref(trans, root, cow, 0);
		ret = btrfs_inc_ref(trans, root, cow, 0, 1);
		BUG_ON(ret);
		ret = btrfs_dec_ref(trans, root, buf, 1);
		ret = btrfs_dec_ref(trans, root, buf, 1, 1);
		BUG_ON(ret);
		}
		clean_tree_block(trans, root, buf);
		@@ -446,7 +446,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,

		cow = btrfs_alloc_free_block(trans, root, buf->len, parent_start,
		root->root_key.objectid, &disk_key,
		level, search_start, empty_size);
		level, search_start, empty_size, 1);
		if (IS_ERR(cow))
		return PTR_ERR(cow);

		@@ -484,7 +484,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
		rcu_assign_pointer(root->node, cow);

		btrfs_free_tree_block(trans, root, buf, parent_start,
		last_ref);
		last_ref, 1);
		free_extent_buffer(buf);
		add_root_to_dirty_list(root);
		} else {
		@@ -500,7 +500,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
		trans->transid);
		btrfs_mark_buffer_dirty(parent);
		btrfs_free_tree_block(trans, root, buf, parent_start,
		last_ref);
		last_ref, 1);
		}
		if (unlock_orig)
		btrfs_tree_unlock(buf);
		@@ -957,7 +957,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
		free_extent_buffer(mid);

		root_sub_used(root, mid->len);
		btrfs_free_tree_block(trans, root, mid, 0, 1);
		btrfs_free_tree_block(trans, root, mid, 0, 1, 0);
		/* once for the root ptr */
		free_extent_buffer(mid);
		return 0;
		@@ -1015,7 +1015,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
		if (wret)
		ret = wret;
		root_sub_used(root, right->len);
		btrfs_free_tree_block(trans, root, right, 0, 1);
		btrfs_free_tree_block(trans, root, right, 0, 1, 0);
		free_extent_buffer(right);
		right = NULL;
		} else {
		@@ -1055,7 +1055,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
		if (wret)
		ret = wret;
		root_sub_used(root, mid->len);
		btrfs_free_tree_block(trans, root, mid, 0, 1);
		btrfs_free_tree_block(trans, root, mid, 0, 1, 0);
		free_extent_buffer(mid);
		mid = NULL;
		} else {
		@@ -2089,7 +2089,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,

		c = btrfs_alloc_free_block(trans, root, root->nodesize, 0,
		root->root_key.objectid, &lower_key,
		level, root->node->start, 0);
		level, root->node->start, 0, 0);
		if (IS_ERR(c))
		return PTR_ERR(c);

		@@ -2216,7 +2216,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,

		split = btrfs_alloc_free_block(trans, root, root->nodesize, 0,
		root->root_key.objectid,
		&disk_key, level, c->start, 0);
		&disk_key, level, c->start, 0, 0);
		if (IS_ERR(split))
		return PTR_ERR(split);

		@@ -2970,7 +2970,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,

		right = btrfs_alloc_free_block(trans, root, root->leafsize, 0,
		root->root_key.objectid,
		&disk_key, 0, l->start, 0);
		&disk_key, 0, l->start, 0, 0);
		if (IS_ERR(right))
		return PTR_ERR(right);

		@@ -3781,7 +3781,7 @@ static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans,

		root_sub_used(root, leaf->len);

		btrfs_free_tree_block(trans, root, leaf, 0, 1);
		btrfs_free_tree_block(trans, root, leaf, 0, 1, 0);
		return 0;
		}
		/*

fs/btrfs/ctree.h

+16 −8

Original line number	Diff line number	Diff line
		@@ -2439,11 +2439,11 @@ struct extent_buffer btrfs_alloc_free_block(struct btrfs_trans_handle trans,
		struct btrfs_root *root, u32 blocksize,
		u64 parent, u64 root_objectid,
		struct btrfs_disk_key *key, int level,
		u64 hint, u64 empty_size);
		u64 hint, u64 empty_size, int for_cow);
		void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
		struct btrfs_root *root,
		struct extent_buffer *buf,
		u64 parent, int last_ref);
		u64 parent, int last_ref, int for_cow);
		struct extent_buffer btrfs_init_new_buffer(struct btrfs_trans_handle trans,
		struct btrfs_root *root,
		u64 bytenr, u32 blocksize,
		@@ -2463,17 +2463,17 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
		u64 search_end, struct btrfs_key *ins,
		u64 data);
		int btrfs_inc_ref(struct btrfs_trans_handle trans, struct btrfs_root root,
		struct extent_buffer *buf, int full_backref);
		struct extent_buffer *buf, int full_backref, int for_cow);
		int btrfs_dec_ref(struct btrfs_trans_handle trans, struct btrfs_root root,
		struct extent_buffer *buf, int full_backref);
		struct extent_buffer *buf, int full_backref, int for_cow);
		int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
		struct btrfs_root *root,
		u64 bytenr, u64 num_bytes, u64 flags,
		int is_data);
		int btrfs_free_extent(struct btrfs_trans_handle *trans,
		struct btrfs_root *root,
		u64 bytenr, u64 num_bytes, u64 parent,
		u64 root_objectid, u64 owner, u64 offset);
		u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid,
		u64 owner, u64 offset, int for_cow);

		int btrfs_free_reserved_extent(struct btrfs_root *root, u64 start, u64 len);
		int btrfs_free_and_pin_reserved_extent(struct btrfs_root *root,
		@@ -2485,7 +2485,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
		int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
		struct btrfs_root *root,
		u64 bytenr, u64 num_bytes, u64 parent,
		u64 root_objectid, u64 owner, u64 offset);
		u64 root_objectid, u64 owner, u64 offset, int for_cow);

		int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
		struct btrfs_root *root);
		@@ -2644,10 +2644,18 @@ static inline int btrfs_insert_empty_item(struct btrfs_trans_handle *trans,
		}

		int btrfs_next_leaf(struct btrfs_root root, struct btrfs_path path);
		static inline int btrfs_next_item(struct btrfs_root root, struct btrfs_path p)
		{
		++p->slots[0];
		if (p->slots[0] >= btrfs_header_nritems(p->nodes[0]))
		return btrfs_next_leaf(root, p);
		return 0;
		}
		int btrfs_prev_leaf(struct btrfs_root root, struct btrfs_path path);
		int btrfs_leaf_free_space(struct btrfs_root root, struct extent_buffer leaf);
		void btrfs_drop_snapshot(struct btrfs_root *root,
		struct btrfs_block_rsv *block_rsv, int update_ref);
		struct btrfs_block_rsv *block_rsv, int update_ref,
		int for_reloc);
		int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
		struct btrfs_root *root,
		struct extent_buffer *node,