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

Commit c1a198d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs updates from Chris Mason:
 "This has our usual assortment of fixes and cleanups, but the biggest
  change included is Omar Sandoval's free space tree.  It's not the
  default yet, mounting -o space_cache=v2 enables it and sets a readonly
  compat bit.  The tree can actually be deleted and regenerated if there
  are any problems, but it has held up really well in testing so far.

  For very large filesystems (30T+) our existing free space caching code
  can end up taking a huge amount of time during commits.  The new tree
  based code is faster and less work overall to update as the commit
  progresses.

  Omar worked on this during the summer and we'll hammer on it in
  production here at FB over the next few months"

* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (73 commits)
  Btrfs: fix fitrim discarding device area reserved for boot loader's use
  Btrfs: Check metadata redundancy on balance
  btrfs: statfs: report zero available if metadata are exhausted
  btrfs: preallocate path for snapshot creation at ioctl time
  btrfs: allocate root item at snapshot ioctl time
  btrfs: do an allocation earlier during snapshot creation
  btrfs: use smaller type for btrfs_path locks
  btrfs: use smaller type for btrfs_path lowest_level
  btrfs: use smaller type for btrfs_path reada
  btrfs: cleanup, use enum values for btrfs_path reada
  btrfs: constify static arrays
  btrfs: constify remaining structs with function pointers
  btrfs tests: replace whole ops structure for free space tests
  btrfs: use list_for_each_entry* in backref.c
  btrfs: use list_for_each_entry_safe in free-space-cache.c
  btrfs: use list_for_each_entry* in check-integrity.c
  Btrfs: use linux/sizes.h to represent constants
  btrfs: cleanup, remove stray return statements
  btrfs: zero out delayed node upon allocation
  btrfs: pass proper enum type to start_transaction()
  ...
parents 48f58ba9 988f1f57

fs/btrfs/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.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 qgroup.o send.o dev-replace.o raid56.o \

	   uuid-tree.o props.o hash.o

	   uuid-tree.o props.o hash.o free-space-tree.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

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



btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \

	tests/extent-buffer-tests.o tests/btrfs-tests.o \

	tests/extent-io-tests.o tests/inode-tests.o tests/qgroup-tests.o
 
	tests/extent-io-tests.o tests/inode-tests.o tests/qgroup-tests.o \

	tests/free-space-tree-tests.o

fs/btrfs/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 


	size = __btrfs_getxattr(inode, name, "", 0);

	if (size > 0) {

		value = kzalloc(size, GFP_NOFS);

		value = kzalloc(size, GFP_KERNEL);

		if (!value)

			return ERR_PTR(-ENOMEM);

		size = __btrfs_getxattr(inode, name, value, size);
@@ -102,7 +102,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 


	if (acl) {

		size = posix_acl_xattr_size(acl->a_count);

		value = kmalloc(size, GFP_NOFS);

		value = kmalloc(size, GFP_KERNEL);

		if (!value) {

			ret = -ENOMEM;

			goto out;

fs/btrfs/async-thread.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct __btrfs_workqueue * 
__btrfs_alloc_workqueue(const char *name, unsigned int flags, int limit_active,

			 int thresh)

{

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL);



	if (!ret)

		return NULL;
@@ -148,7 +148,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, 
					      int limit_active,

					      int thresh)

{

	struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);

	struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL);



	if (!ret)

		return NULL;

fs/btrfs/backref.c

+6 −17
Original line number Diff line number Diff line
@@ -520,13 +520,10 @@ static inline int ref_for_same_block(struct __prelim_ref *ref1, 
static int __add_missing_keys(struct btrfs_fs_info *fs_info,

			      struct list_head *head)

{

	struct list_head *pos;

	struct extent_buffer *eb;



	list_for_each(pos, head) {

	struct __prelim_ref *ref;

		ref = list_entry(pos, struct __prelim_ref, list);

	struct extent_buffer *eb;



	list_for_each_entry(ref, head, list) {

		if (ref->parent)

			continue;

		if (ref->key_for_search.type)
@@ -563,23 +560,15 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
 */

static void __merge_refs(struct list_head *head, int mode)

{

	struct list_head *pos1;



	list_for_each(pos1, head) {

		struct list_head *n2;

		struct list_head *pos2;

	struct __prelim_ref *ref1;



		ref1 = list_entry(pos1, struct __prelim_ref, list);

	list_for_each_entry(ref1, head, list) {

		struct __prelim_ref *ref2 = ref1, *tmp;



		for (pos2 = pos1->next, n2 = pos2->next; pos2 != head;

		     pos2 = n2, n2 = pos2->next) {

			struct __prelim_ref *ref2;

		list_for_each_entry_safe_continue(ref2, tmp, head, list) {

			struct __prelim_ref *xchg;

			struct extent_inode_elem *eie;



			ref2 = list_entry(pos2, struct __prelim_ref, list);



			if (!ref_for_same_block(ref1, ref2))

				continue;

			if (mode == 1) {

fs/btrfs/btrfs_inode.h

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ struct btrfs_inode { 
	/* File creation time. */

	struct timespec i_otime;



	/* Hook into fs_info->delayed_iputs */

	struct list_head delayed_iput;

	long delayed_iput_count;



	struct inode vfs_inode;

};