Commit 859862dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs updates from Chris Mason:
 "The biggest change here is Josef's rework of the btrfs quota
  accounting, which improves the in-memory tracking of delayed extent
  operations.

  I had been working on Btrfs stack usage for a while, mostly because it
  had become impossible to do long stress runs with slab, lockdep and
  pagealloc debugging turned on without blowing the stack.  Even though
  you upgraded us to a nice king sized stack, I kept most of the
  patches.

  We also have some very hard to find corruption fixes, an awesome sysfs
  use after free, and the usual assortment of optimizations, cleanups
  and other fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (80 commits)
  Btrfs: convert smp_mb__{before,after}_clear_bit
  Btrfs: fix scrub_print_warning to handle skinny metadata extents
  Btrfs: make fsync work after cloning into a file
  Btrfs: use right type to get real comparison
  Btrfs: don't check nodes for extent items
  Btrfs: don't release invalid page in btrfs_page_exists_in_range()
  Btrfs: make sure we retry if page is a retriable exception
  Btrfs: make sure we retry if we couldn't get the page
  btrfs: replace EINVAL with EOPNOTSUPP for dev_replace raid56
  trivial: fs/btrfs/ioctl.c: fix typo s/substract/subtract/
  Btrfs: fix leaf corruption after __btrfs_drop_extents
  Btrfs: ensure btrfs_prev_leaf doesn't miss 1 item
  Btrfs: fix clone to deal with holes when NO_HOLES feature is enabled
  btrfs: free delayed node outside of root->inode_lock
  btrfs: replace EINVAL with ERANGE for resize when ULLONG_MAX
  Btrfs: fix transaction leak during fsync call
  btrfs: Avoid trucating page or punching hole in a already existed hole.
  Btrfs: update commit root on snapshot creation after orphan cleanup
  Btrfs: ioctl, don't re-lock extent range when not necessary
  Btrfs: avoid visiting all extent items when cloning a range
  ...
parents 412dd3a6 c7548af6

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 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/extent-io-tests.o tests/inode-tests.o tests/qgroup-tests.o

fs/btrfs/acl.c

+0 −7
Original line number Diff line number Diff line
@@ -79,13 +79,6 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 
	const char *name;

	char *value = NULL;



	if (acl) {

		ret = posix_acl_valid(acl);

		if (ret < 0)

			return ret;

		ret = 0;

	}



	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

fs/btrfs/backref.c

+27 −14
Original line number Diff line number Diff line
@@ -900,7 +900,11 @@ again: 
		goto out;

	BUG_ON(ret == 0);



#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (trans && likely(trans->type != __TRANS_DUMMY)) {

#else

	if (trans) {

#endif

		/*

		 * look if there are updates for this ref queued and lock the

		 * head
@@ -984,11 +988,12 @@ again: 
				goto out;

		}

		if (ref->count && ref->parent) {

			if (extent_item_pos && !ref->inode_list) {

			if (extent_item_pos && !ref->inode_list &&

			    ref->level == 0) {

				u32 bsz;

				struct extent_buffer *eb;

				bsz = btrfs_level_size(fs_info->extent_root,

							info_level);

							ref->level);

				eb = read_tree_block(fs_info->extent_root,

							   ref->parent, bsz, 0);

				if (!eb || !extent_buffer_uptodate(eb)) {
@@ -1404,6 +1409,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
 * returns <0 on error

 */

static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb,

				   struct btrfs_key *key,

				   struct btrfs_extent_item *ei, u32 item_size,

				   struct btrfs_extent_inline_ref **out_eiref,

				   int *out_type)
@@ -1416,19 +1422,26 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, 
		/* first call */

		flags = btrfs_extent_flags(eb, ei);

		if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) {

			if (key->type == BTRFS_METADATA_ITEM_KEY) {

				/* a skinny metadata extent */

				*out_eiref =

				     (struct btrfs_extent_inline_ref *)(ei + 1);

			} else {

				WARN_ON(key->type != BTRFS_EXTENT_ITEM_KEY);

				info = (struct btrfs_tree_block_info *)(ei + 1);

				*out_eiref =

				   (struct btrfs_extent_inline_ref *)(info + 1);

			}

		} else {

			*out_eiref = (struct btrfs_extent_inline_ref *)(ei + 1);

		}

		*ptr = (unsigned long)*out_eiref;

		if ((void *)*ptr >= (void *)ei + item_size)

		if ((unsigned long)(*ptr) >= (unsigned long)ei + item_size)

			return -ENOENT;

	}



	end = (unsigned long)ei + item_size;

	*out_eiref = (struct btrfs_extent_inline_ref *)*ptr;

	*out_eiref = (struct btrfs_extent_inline_ref *)(*ptr);

	*out_type = btrfs_extent_inline_ref_type(eb, *out_eiref);



	*ptr += btrfs_extent_inline_ref_size(*out_type);
@@ -1447,8 +1460,8 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, 
 * <0 on error.

 */

int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb,

				struct btrfs_extent_item *ei, u32 item_size,

				u64 *out_root, u8 *out_level)

			    struct btrfs_key *key, struct btrfs_extent_item *ei,

			    u32 item_size, u64 *out_root, u8 *out_level)

{

	int ret;

	int type;
@@ -1459,7 +1472,7 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, 
		return 1;



	while (1) {

		ret = __get_extent_inline_ref(ptr, eb, ei, item_size,

		ret = __get_extent_inline_ref(ptr, eb, key, ei, item_size,

					      &eiref, &type);

		if (ret < 0)

			return ret;

fs/btrfs/backref.h

+4 −4
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
			u64 *flags);



int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb,

				struct btrfs_extent_item *ei, u32 item_size,

				u64 *out_root, u8 *out_level);

			    struct btrfs_key *key, struct btrfs_extent_item *ei,

			    u32 item_size, u64 *out_root, u8 *out_level);



int iterate_extent_inodes(struct btrfs_fs_info *fs_info,

				u64 extent_item_objectid,

fs/btrfs/btrfs_inode.h

+2 −0
Original line number Diff line number Diff line
@@ -284,4 +284,6 @@ static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode) 
		  &BTRFS_I(inode)->runtime_flags);

}



bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE