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

Commit f004fae0 authored by David Sterba's avatar David Sterba
Browse files

Merge branch 'cleanups-4.6' into for-chris-4.6

parents 675d276b f827ba9a

fs/btrfs/backref.c

+4 −8
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ int __init btrfs_prelim_ref_init(void) 


void btrfs_prelim_ref_exit(void)

{

	if (btrfs_prelim_ref_cache)

	kmem_cache_destroy(btrfs_prelim_ref_cache);

}
@@ -566,17 +565,14 @@ static void __merge_refs(struct list_head *head, int mode) 
		struct __prelim_ref *pos2 = pos1, *tmp;



		list_for_each_entry_safe_continue(pos2, tmp, head, list) {

			struct __prelim_ref *xchg, *ref1 = pos1, *ref2 = pos2;

			struct __prelim_ref *ref1 = pos1, *ref2 = pos2;

			struct extent_inode_elem *eie;



			if (!ref_for_same_block(ref1, ref2))

				continue;

			if (mode == 1) {

				if (!ref1->parent && ref2->parent) {

					xchg = ref1;

					ref1 = ref2;

					ref2 = xchg;

				}

				if (!ref1->parent && ref2->parent)

					swap(ref1, ref2);

			} else {

				if (ref1->parent != ref2->parent)

					continue;

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3490,8 +3490,7 @@ u64 btrfs_csum_bytes_to_leaves(struct btrfs_root *root, u64 csum_bytes); 
static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_root *root,

						 unsigned num_items)

{

	return (root->nodesize + root->nodesize * (BTRFS_MAX_LEVEL - 1)) *

		2 * num_items;

	return root->nodesize * BTRFS_MAX_LEVEL * 2 * num_items;

}



/*

fs/btrfs/delayed-inode.c

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ int __init btrfs_delayed_inode_init(void) 


void btrfs_delayed_inode_exit(void)

{

	if (delayed_node_cache)

	kmem_cache_destroy(delayed_node_cache);

}

fs/btrfs/delayed-ref.c

+4 −8
Original line number Diff line number Diff line
@@ -929,13 +929,9 @@ btrfs_find_delayed_ref_head(struct btrfs_trans_handle *trans, u64 bytenr) 


void btrfs_delayed_ref_exit(void)

{

	if (btrfs_delayed_ref_head_cachep)

	kmem_cache_destroy(btrfs_delayed_ref_head_cachep);

	if (btrfs_delayed_tree_ref_cachep)

	kmem_cache_destroy(btrfs_delayed_tree_ref_cachep);

	if (btrfs_delayed_data_ref_cachep)

	kmem_cache_destroy(btrfs_delayed_data_ref_cachep);

	if (btrfs_delayed_extent_op_cachep)

	kmem_cache_destroy(btrfs_delayed_extent_op_cachep);

}

fs/btrfs/disk-io.c

+1 −2
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ int __init btrfs_end_io_wq_init(void) 


void btrfs_end_io_wq_exit(void)

{

	if (btrfs_end_io_wq_cache)

	kmem_cache_destroy(btrfs_end_io_wq_cache);

}