Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus (b478b2ba) · Commits · e / devices / android_kernel_samsung_universal8895

fs/btrfs/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ 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 ulist.o
		reada.o backref.o ulist.o qgroup.o

		btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o
		btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/backref.c

+9 −21

Original line number	Diff line number	Diff line
		@@ -773,9 +773,8 @@ static int __add_keyed_refs(struct btrfs_fs_info *fs_info,
		*/
		static int find_parent_nodes(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info, u64 bytenr,
		u64 delayed_ref_seq, u64 time_seq,
		struct ulist refs, struct ulist roots,
		const u64 *extent_item_pos)
		u64 time_seq, struct ulist *refs,
		struct ulist roots, const u64 extent_item_pos)
		{
		struct btrfs_key key;
		struct btrfs_path *path;
		@@ -837,7 +836,7 @@ again:
		btrfs_put_delayed_ref(&head->node);
		goto again;
		}
		ret = __add_delayed_refs(head, delayed_ref_seq,
		ret = __add_delayed_refs(head, time_seq,
		&prefs_delayed);
		mutex_unlock(&head->mutex);
		if (ret) {
		@@ -981,8 +980,7 @@ static void free_leaf_list(struct ulist *blocks)
		*/
		static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info, u64 bytenr,
		u64 delayed_ref_seq, u64 time_seq,
		struct ulist **leafs,
		u64 time_seq, struct ulist **leafs,
		const u64 *extent_item_pos)
		{
		struct ulist *tmp;
		@@ -997,7 +995,7 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,
		return -ENOMEM;
		}

		ret = find_parent_nodes(trans, fs_info, bytenr, delayed_ref_seq,
		ret = find_parent_nodes(trans, fs_info, bytenr,
		time_seq, *leafs, tmp, extent_item_pos);
		ulist_free(tmp);

		@@ -1024,8 +1022,7 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,
		*/
		int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info, u64 bytenr,
		u64 delayed_ref_seq, u64 time_seq,
		struct ulist **roots)
		u64 time_seq, struct ulist **roots)
		{
		struct ulist *tmp;
		struct ulist_node *node = NULL;
		@@ -1043,7 +1040,7 @@ int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

		ULIST_ITER_INIT(&uiter);
		while (1) {
		ret = find_parent_nodes(trans, fs_info, bytenr, delayed_ref_seq,
		ret = find_parent_nodes(trans, fs_info, bytenr,
		time_seq, tmp, *roots, NULL);
		if (ret < 0 && ret != -ENOENT) {
		ulist_free(tmp);
		@@ -1376,11 +1373,9 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
		struct ulist *roots = NULL;
		struct ulist_node *ref_node = NULL;
		struct ulist_node *root_node = NULL;
		struct seq_list seq_elem = {};
		struct seq_list tree_mod_seq_elem = {};
		struct ulist_iterator ref_uiter;
		struct ulist_iterator root_uiter;
		struct btrfs_delayed_ref_root *delayed_refs = NULL;

		pr_debug("resolving all inodes for extent %llu\n",
		extent_item_objectid);
		@@ -1391,16 +1386,11 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
		trans = btrfs_join_transaction(fs_info->extent_root);
		if (IS_ERR(trans))
		return PTR_ERR(trans);

		delayed_refs = &trans->transaction->delayed_refs;
		spin_lock(&delayed_refs->lock);
		btrfs_get_delayed_seq(delayed_refs, &seq_elem);
		spin_unlock(&delayed_refs->lock);
		btrfs_get_tree_mod_seq(fs_info, &tree_mod_seq_elem);
		}

		ret = btrfs_find_all_leafs(trans, fs_info, extent_item_objectid,
		seq_elem.seq, tree_mod_seq_elem.seq, &refs,
		tree_mod_seq_elem.seq, &refs,
		&extent_item_pos);
		if (ret)
		goto out;
		@@ -1408,7 +1398,6 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
		ULIST_ITER_INIT(&ref_uiter);
		while (!ret && (ref_node = ulist_next(refs, &ref_uiter))) {
		ret = btrfs_find_all_roots(trans, fs_info, ref_node->val,
		seq_elem.seq,
		tree_mod_seq_elem.seq, &roots);
		if (ret)
		break;
		@@ -1431,7 +1420,6 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
		out:
		if (!search_commit_root) {
		btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);
		btrfs_put_delayed_seq(delayed_refs, &seq_elem);
		btrfs_end_transaction(trans, fs_info->extent_root);
		}

fs/btrfs/backref.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -58,8 +58,7 @@ 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 delayed_ref_seq, u64 time_seq,
		struct ulist **roots);
		u64 time_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,

fs/btrfs/ctree.c

+243 −104

Original line number	Diff line number	Diff line
		@@ -321,7 +321,7 @@ struct tree_mod_root {
		struct tree_mod_elem {
		struct rb_node node;
		u64 index; /* shifted logical */
		struct seq_list elem;
		u64 seq;
		enum mod_log_op op;

		/* this is used for MOD_LOG_KEY_* and MOD_LOG_MOVE_KEYS operations */
		@@ -341,20 +341,50 @@ struct tree_mod_elem {
		struct tree_mod_root old_root;
		};

		static inline void
		__get_tree_mod_seq(struct btrfs_fs_info fs_info, struct seq_list elem)
		static inline void tree_mod_log_read_lock(struct btrfs_fs_info *fs_info)
		{
		elem->seq = atomic_inc_return(&fs_info->tree_mod_seq);
		list_add_tail(&elem->list, &fs_info->tree_mod_seq_list);
		read_lock(&fs_info->tree_mod_log_lock);
		}

		static inline void tree_mod_log_read_unlock(struct btrfs_fs_info *fs_info)
		{
		read_unlock(&fs_info->tree_mod_log_lock);
		}

		static inline void tree_mod_log_write_lock(struct btrfs_fs_info *fs_info)
		{
		write_lock(&fs_info->tree_mod_log_lock);
		}

		void btrfs_get_tree_mod_seq(struct btrfs_fs_info *fs_info,
		static inline void tree_mod_log_write_unlock(struct btrfs_fs_info *fs_info)
		{
		write_unlock(&fs_info->tree_mod_log_lock);
		}

		/*
		* This adds a new blocker to the tree mod log's blocker list if the @elem
		* passed does not already have a sequence number set. So when a caller expects
		* to record tree modifications, it should ensure to set elem->seq to zero
		* before calling btrfs_get_tree_mod_seq.
		* Returns a fresh, unused tree log modification sequence number, even if no new
		* blocker was added.
		*/
		u64 btrfs_get_tree_mod_seq(struct btrfs_fs_info *fs_info,
		struct seq_list *elem)
		{
		elem->flags = 1;
		u64 seq;

		tree_mod_log_write_lock(fs_info);
		spin_lock(&fs_info->tree_mod_seq_lock);
		__get_tree_mod_seq(fs_info, elem);
		if (!elem->seq) {
		elem->seq = btrfs_inc_tree_mod_seq(fs_info);
		list_add_tail(&elem->list, &fs_info->tree_mod_seq_list);
		}
		seq = btrfs_inc_tree_mod_seq(fs_info);
		spin_unlock(&fs_info->tree_mod_seq_lock);
		tree_mod_log_write_unlock(fs_info);

		return seq;
		}

		void btrfs_put_tree_mod_seq(struct btrfs_fs_info *fs_info,
		@@ -371,41 +401,46 @@ void btrfs_put_tree_mod_seq(struct btrfs_fs_info *fs_info,
		if (!seq_putting)
		return;

		BUG_ON(!(elem->flags & 1));
		spin_lock(&fs_info->tree_mod_seq_lock);
		list_del(&elem->list);
		elem->seq = 0;

		list_for_each_entry(cur_elem, &fs_info->tree_mod_seq_list, list) {
		if ((cur_elem->flags & 1) && cur_elem->seq < min_seq) {
		if (cur_elem->seq < min_seq) {
		if (seq_putting > cur_elem->seq) {
		/*
		* blocker with lower sequence number exists, we
		* cannot remove anything from the log
		*/
		goto out;
		spin_unlock(&fs_info->tree_mod_seq_lock);
		return;
		}
		min_seq = cur_elem->seq;
		}
		}
		spin_unlock(&fs_info->tree_mod_seq_lock);

		/*
		* we removed the lowest blocker from the blocker list, so there may be
		* more processible delayed refs.
		*/
		wake_up(&fs_info->tree_mod_seq_wait);

		/*
		* anything that's lower than the lowest existing (read: blocked)
		* sequence number can be removed from the tree.
		*/
		write_lock(&fs_info->tree_mod_log_lock);
		tree_mod_log_write_lock(fs_info);
		tm_root = &fs_info->tree_mod_log;
		for (node = rb_first(tm_root); node; node = next) {
		next = rb_next(node);
		tm = container_of(node, struct tree_mod_elem, node);
		if (tm->elem.seq > min_seq)
		if (tm->seq > min_seq)
		continue;
		rb_erase(node, tm_root);
		list_del(&tm->elem.list);
		kfree(tm);
		}
		write_unlock(&fs_info->tree_mod_log_lock);
		out:
		spin_unlock(&fs_info->tree_mod_seq_lock);
		tree_mod_log_write_unlock(fs_info);
		}

		/*
		@@ -423,11 +458,9 @@ __tree_mod_log_insert(struct btrfs_fs_info fs_info, struct tree_mod_elem tm)
		struct rb_node **new;
		struct rb_node *parent = NULL;
		struct tree_mod_elem *cur;
		int ret = 0;

		BUG_ON(!tm \|\| !tm->elem.seq);
		BUG_ON(!tm \|\| !tm->seq);

		write_lock(&fs_info->tree_mod_log_lock);
		tm_root = &fs_info->tree_mod_log;
		new = &tm_root->rb_node;
		while (*new) {
		@@ -437,88 +470,81 @@ __tree_mod_log_insert(struct btrfs_fs_info fs_info, struct tree_mod_elem tm)
		new = &((*new)->rb_left);
		else if (cur->index > tm->index)
		new = &((*new)->rb_right);
		else if (cur->elem.seq < tm->elem.seq)
		else if (cur->seq < tm->seq)
		new = &((*new)->rb_left);
		else if (cur->elem.seq > tm->elem.seq)
		else if (cur->seq > tm->seq)
		new = &((*new)->rb_right);
		else {
		kfree(tm);
		ret = -EEXIST;
		goto unlock;
		return -EEXIST;
		}
		}

		rb_link_node(&tm->node, parent, new);
		rb_insert_color(&tm->node, tm_root);
		unlock:
		write_unlock(&fs_info->tree_mod_log_lock);
		return ret;
		return 0;
		}

		/*
		* Determines if logging can be omitted. Returns 1 if it can. Otherwise, it
		* returns zero with the tree_mod_log_lock acquired. The caller must hold
		* this until all tree mod log insertions are recorded in the rb tree and then
		* call tree_mod_log_write_unlock() to release.
		*/
		static inline int tree_mod_dont_log(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb) {
		smp_mb();
		if (list_empty(&(fs_info)->tree_mod_seq_list))
		return 1;
		if (!eb)
		return 0;
		if (btrfs_header_level(eb) == 0)
		if (eb && btrfs_header_level(eb) == 0)
		return 1;

		tree_mod_log_write_lock(fs_info);
		if (list_empty(&fs_info->tree_mod_seq_list)) {
		/*
		* someone emptied the list while we were waiting for the lock.
		* we must not add to the list when no blocker exists.
		*/
		tree_mod_log_write_unlock(fs_info);
		return 1;
		}

		return 0;
		}

		/*
		* This allocates memory and gets a tree modification sequence number when
		* needed.
		* This allocates memory and gets a tree modification sequence number.
		*
		* Returns 0 when no sequence number is needed, < 0 on error.
		* Returns 1 when a sequence number was added. In this case,
		* fs_info->tree_mod_seq_lock was acquired and must be released by the caller
		* after inserting into the rb tree.
		* Returns <0 on error.
		* Returns >0 (the added sequence number) on success.
		*/
		static inline int tree_mod_alloc(struct btrfs_fs_info *fs_info, gfp_t flags,
		struct tree_mod_elem **tm_ret)
		{
		struct tree_mod_elem *tm;
		int seq;

		if (tree_mod_dont_log(fs_info, NULL))
		return 0;

		tm = tm_ret = kzalloc(sizeof(tm), flags);
		if (!tm)
		return -ENOMEM;

		tm->elem.flags = 0;
		spin_lock(&fs_info->tree_mod_seq_lock);
		if (list_empty(&fs_info->tree_mod_seq_list)) {
		/*
		* someone emptied the list while we were waiting for the lock.
		* we must not add to the list, because no blocker exists. items
		* are removed from the list only when the existing blocker is
		* removed from the list.
		* once we switch from spin locks to something different, we should
		* honor the flags parameter here.
		*/
		kfree(tm);
		seq = 0;
		spin_unlock(&fs_info->tree_mod_seq_lock);
		} else {
		__get_tree_mod_seq(fs_info, &tm->elem);
		seq = tm->elem.seq;
		}
		tm = tm_ret = kzalloc(sizeof(tm), GFP_ATOMIC);
		if (!tm)
		return -ENOMEM;

		return seq;
		tm->seq = btrfs_inc_tree_mod_seq(fs_info);
		return tm->seq;
		}

		static noinline int
		tree_mod_log_insert_key_mask(struct btrfs_fs_info *fs_info,
		static inline int
		__tree_mod_log_insert_key(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, int slot,
		enum mod_log_op op, gfp_t flags)
		{
		struct tree_mod_elem *tm;
		int ret;
		struct tree_mod_elem *tm;

		ret = tree_mod_alloc(fs_info, flags, &tm);
		if (ret <= 0)
		if (ret < 0)
		return ret;

		tm->index = eb->start >> PAGE_CACHE_SHIFT;
		@@ -530,8 +556,22 @@ tree_mod_log_insert_key_mask(struct btrfs_fs_info *fs_info,
		tm->slot = slot;
		tm->generation = btrfs_node_ptr_generation(eb, slot);

		ret = __tree_mod_log_insert(fs_info, tm);
		spin_unlock(&fs_info->tree_mod_seq_lock);
		return __tree_mod_log_insert(fs_info, tm);
		}

		static noinline int
		tree_mod_log_insert_key_mask(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, int slot,
		enum mod_log_op op, gfp_t flags)
		{
		int ret;

		if (tree_mod_dont_log(fs_info, eb))
		return 0;

		ret = __tree_mod_log_insert_key(fs_info, eb, slot, op, flags);

		tree_mod_log_write_unlock(fs_info);
		return ret;
		}

		@@ -542,6 +582,14 @@ tree_mod_log_insert_key(struct btrfs_fs_info fs_info, struct extent_buffer eb,
		return tree_mod_log_insert_key_mask(fs_info, eb, slot, op, GFP_NOFS);
		}

		static noinline int
		tree_mod_log_insert_key_locked(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, int slot,
		enum mod_log_op op)
		{
		return __tree_mod_log_insert_key(fs_info, eb, slot, op, GFP_NOFS);
		}

		static noinline int
		tree_mod_log_insert_move(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, int dst_slot, int src_slot,
		@@ -555,14 +603,14 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info,
		return 0;

		for (i = 0; i + dst_slot < src_slot && i < nr_items; i++) {
		ret = tree_mod_log_insert_key(fs_info, eb, i + dst_slot,
		ret = tree_mod_log_insert_key_locked(fs_info, eb, i + dst_slot,
		MOD_LOG_KEY_REMOVE_WHILE_MOVING);
		BUG_ON(ret < 0);
		}

		ret = tree_mod_alloc(fs_info, flags, &tm);
		if (ret <= 0)
		return ret;
		if (ret < 0)
		goto out;

		tm->index = eb->start >> PAGE_CACHE_SHIFT;
		tm->slot = src_slot;
		@@ -571,10 +619,26 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info,
		tm->op = MOD_LOG_MOVE_KEYS;

		ret = __tree_mod_log_insert(fs_info, tm);
		spin_unlock(&fs_info->tree_mod_seq_lock);
		out:
		tree_mod_log_write_unlock(fs_info);
		return ret;
		}

		static inline void
		__tree_mod_log_free_eb(struct btrfs_fs_info fs_info, struct extent_buffer eb)
		{
		int i;
		u32 nritems;
		int ret;

		nritems = btrfs_header_nritems(eb);
		for (i = nritems - 1; i >= 0; i--) {
		ret = tree_mod_log_insert_key_locked(fs_info, eb, i,
		MOD_LOG_KEY_REMOVE_WHILE_FREEING);
		BUG_ON(ret < 0);
		}
		}

		static noinline int
		tree_mod_log_insert_root(struct btrfs_fs_info *fs_info,
		struct extent_buffer *old_root,
		@@ -583,9 +647,14 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info,
		struct tree_mod_elem *tm;
		int ret;

		if (tree_mod_dont_log(fs_info, NULL))
		return 0;

		__tree_mod_log_free_eb(fs_info, old_root);

		ret = tree_mod_alloc(fs_info, flags, &tm);
		if (ret <= 0)
		return ret;
		if (ret < 0)
		goto out;

		tm->index = new_root->start >> PAGE_CACHE_SHIFT;
		tm->old_root.logical = old_root->start;
		@@ -594,7 +663,8 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info,
		tm->op = MOD_LOG_ROOT_REPLACE;

		ret = __tree_mod_log_insert(fs_info, tm);
		spin_unlock(&fs_info->tree_mod_seq_lock);
		out:
		tree_mod_log_write_unlock(fs_info);
		return ret;
		}

		@@ -608,7 +678,7 @@ __tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq,
		struct tree_mod_elem *found = NULL;
		u64 index = start >> PAGE_CACHE_SHIFT;

		read_lock(&fs_info->tree_mod_log_lock);
		tree_mod_log_read_lock(fs_info);
		tm_root = &fs_info->tree_mod_log;
		node = tm_root->rb_node;
		while (node) {
		@@ -617,18 +687,18 @@ __tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq,
		node = node->rb_left;
		} else if (cur->index > index) {
		node = node->rb_right;
		} else if (cur->elem.seq < min_seq) {
		} else if (cur->seq < min_seq) {
		node = node->rb_left;
		} else if (!smallest) {
		/* we want the node with the highest seq */
		if (found)
		BUG_ON(found->elem.seq > cur->elem.seq);
		BUG_ON(found->seq > cur->seq);
		found = cur;
		node = node->rb_left;
		} else if (cur->elem.seq > min_seq) {
		} else if (cur->seq > min_seq) {
		/* we want the node with the smallest seq */
		if (found)
		BUG_ON(found->elem.seq < cur->elem.seq);
		BUG_ON(found->seq < cur->seq);
		found = cur;
		node = node->rb_right;
		} else {
		@@ -636,7 +706,7 @@ __tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq,
		break;
		}
		}
		read_unlock(&fs_info->tree_mod_log_lock);
		tree_mod_log_read_unlock(fs_info);

		return found;
		}
		@@ -664,7 +734,7 @@ tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq)
		return __tree_mod_log_search(fs_info, start, min_seq, 0);
		}

		static inline void
		static noinline void
		tree_mod_log_eb_copy(struct btrfs_fs_info fs_info, struct extent_buffer dst,
		struct extent_buffer *src, unsigned long dst_offset,
		unsigned long src_offset, int nr_items)
		@@ -675,18 +745,23 @@ tree_mod_log_eb_copy(struct btrfs_fs_info fs_info, struct extent_buffer dst,
		if (tree_mod_dont_log(fs_info, NULL))
		return;

		if (btrfs_header_level(dst) == 0 && btrfs_header_level(src) == 0)
		if (btrfs_header_level(dst) == 0 && btrfs_header_level(src) == 0) {
		tree_mod_log_write_unlock(fs_info);
		return;
		}

		/* speed this up by single seq for all operations? */
		for (i = 0; i < nr_items; i++) {
		ret = tree_mod_log_insert_key(fs_info, src, i + src_offset,
		ret = tree_mod_log_insert_key_locked(fs_info, src,
		i + src_offset,
		MOD_LOG_KEY_REMOVE);
		BUG_ON(ret < 0);
		ret = tree_mod_log_insert_key(fs_info, dst, i + dst_offset,
		ret = tree_mod_log_insert_key_locked(fs_info, dst,
		i + dst_offset,
		MOD_LOG_KEY_ADD);
		BUG_ON(ret < 0);
		}

		tree_mod_log_write_unlock(fs_info);
		}

		static inline void
		@@ -699,7 +774,7 @@ tree_mod_log_eb_move(struct btrfs_fs_info fs_info, struct extent_buffer dst,
		BUG_ON(ret < 0);
		}

		static inline void
		static noinline void
		tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb,
		struct btrfs_disk_key *disk_key, int slot, int atomic)
		@@ -712,30 +787,22 @@ tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info,
		BUG_ON(ret < 0);
		}

		static void tree_mod_log_free_eb(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb)
		static noinline void
		tree_mod_log_free_eb(struct btrfs_fs_info fs_info, struct extent_buffer eb)
		{
		int i;
		int ret;
		u32 nritems;

		if (tree_mod_dont_log(fs_info, eb))
		return;

		nritems = btrfs_header_nritems(eb);
		for (i = nritems - 1; i >= 0; i--) {
		ret = tree_mod_log_insert_key(fs_info, eb, i,
		MOD_LOG_KEY_REMOVE_WHILE_FREEING);
		BUG_ON(ret < 0);
		}
		__tree_mod_log_free_eb(fs_info, eb);

		tree_mod_log_write_unlock(fs_info);
		}

		static inline void
		static noinline void
		tree_mod_log_set_root_pointer(struct btrfs_root *root,
		struct extent_buffer *new_root_node)
		{
		int ret;
		tree_mod_log_free_eb(root->fs_info, root->node);
		ret = tree_mod_log_insert_root(root->fs_info, root->node,
		new_root_node, GFP_NOFS);
		BUG_ON(ret < 0);
		@@ -1069,7 +1136,7 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,
		unsigned long p_size = sizeof(struct btrfs_key_ptr);

		n = btrfs_header_nritems(eb);
		while (tm && tm->elem.seq >= time_seq) {
		while (tm && tm->seq >= time_seq) {
		/*
		* all the operations are recorded with the operator used for
		* the modification. as we're going backwards, we do the
		@@ -2721,6 +2788,78 @@ done:
		return ret;
		}

		/*
		* helper to use instead of search slot if no exact match is needed but
		* instead the next or previous item should be returned.
		* When find_higher is true, the next higher item is returned, the next lower
		* otherwise.
		* When return_any and find_higher are both true, and no higher item is found,
		* return the next lower instead.
		* When return_any is true and find_higher is false, and no lower item is found,
		* return the next higher instead.
		* It returns 0 if any item is found, 1 if none is found (tree empty), and
		* < 0 on error
		*/
		int btrfs_search_slot_for_read(struct btrfs_root *root,
		struct btrfs_key key, struct btrfs_path p,
		int find_higher, int return_any)
		{
		int ret;
		struct extent_buffer *leaf;

		again:
		ret = btrfs_search_slot(NULL, root, key, p, 0, 0);
		if (ret <= 0)
		return ret;
		/*
		* a return value of 1 means the path is at the position where the
		* item should be inserted. Normally this is the next bigger item,
		* but in case the previous item is the last in a leaf, path points
		* to the first free slot in the previous leaf, i.e. at an invalid
		* item.
		*/
		leaf = p->nodes[0];

		if (find_higher) {
		if (p->slots[0] >= btrfs_header_nritems(leaf)) {
		ret = btrfs_next_leaf(root, p);
		if (ret <= 0)
		return ret;
		if (!return_any)
		return 1;
		/*
		* no higher item found, return the next
		* lower instead
		*/
		return_any = 0;
		find_higher = 0;
		btrfs_release_path(p);
		goto again;
		}
		} else {
		if (p->slots[0] >= btrfs_header_nritems(leaf)) {
		/* we're sitting on an invalid slot */
		if (p->slots[0] == 0) {
		ret = btrfs_prev_leaf(root, p);
		if (ret <= 0)
		return ret;
		if (!return_any)
		return 1;
		/*
		* no lower item found, return the next
		* higher instead
		*/
		return_any = 0;
		find_higher = 1;
		btrfs_release_path(p);
		goto again;
		}
		--p->slots[0];
		}
		}
		return 0;
		}

		/*
		* adjust the pointers going up the tree, starting at level
		* making sure the right key of each node is points to 'key'.

fs/btrfs/ctree.h

+225 −8

File changed.

Preview size limit exceeded, changes collapsed.