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

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

Pull btrfs updates from Chris Mason:
 "These are all fixes I'd like to get out to a broader audience.

  The biggest of the bunch is Mark's quota fix, which is also in the
  SUSE kernel, and makes our subvolume quotas dramatically more
  accurate.

  I've been running xfstests with these against your current git
  overnight, but I'm queueing up longer tests as well"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: disable strict file flushes for renames and truncates
  Btrfs: fix csum tree corruption, duplicate and outdated checksums
  Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch
  Btrfs: fix compressed write corruption on enospc
  btrfs: correctly handle return from ulist_add
  btrfs: qgroup: account shared subtrees during snapshot delete
  Btrfs: read lock extent buffer while walking backrefs
  Btrfs: __btrfs_mod_ref should always use no_quota
  btrfs: adjust statfs calculations according to raid profiles
parents 53b95d63 8d875f95

fs/btrfs/backref.c

+8 −6
Original line number Diff line number Diff line
@@ -276,9 +276,8 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, 
			}

			if (ret > 0)

				goto next;

			ret = ulist_add_merge(parents, eb->start,

					      (uintptr_t)eie,

					      (u64 *)&old, GFP_NOFS);

			ret = ulist_add_merge_ptr(parents, eb->start,

						  eie, (void **)&old, GFP_NOFS);

			if (ret < 0)

				break;

			if (!ret && extent_item_pos) {
@@ -1001,16 +1000,19 @@ again: 
					ret = -EIO;

					goto out;

				}

				btrfs_tree_read_lock(eb);

				btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);

				ret = find_extent_in_eb(eb, bytenr,

							*extent_item_pos, &eie);

				btrfs_tree_read_unlock_blocking(eb);

				free_extent_buffer(eb);

				if (ret < 0)

					goto out;

				ref->inode_list = eie;

			}

			ret = ulist_add_merge(refs, ref->parent,

					      (uintptr_t)ref->inode_list,

					      (u64 *)&eie, GFP_NOFS);

			ret = ulist_add_merge_ptr(refs, ref->parent,

						  ref->inode_list,

						  (void **)&eie, GFP_NOFS);

			if (ret < 0)

				goto out;

			if (!ret && extent_item_pos) {

fs/btrfs/btrfs_inode.h

+0 −6
Original line number Diff line number Diff line
@@ -84,12 +84,6 @@ struct btrfs_inode { 
	 */

	struct list_head delalloc_inodes;



	/*

	 * list for tracking inodes that must be sent to disk before a

	 * rename or truncate commit

	 */

	struct list_head ordered_operations;



	/* node for the red-black tree that links inodes in subvolume root */

	struct rb_node rb_node;

fs/btrfs/ctree.c

+10 −10
Original line number Diff line number Diff line
@@ -280,9 +280,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, 1);

		ret = btrfs_inc_ref(trans, root, cow, 1);

	else

		ret = btrfs_inc_ref(trans, root, cow, 0, 1);

		ret = btrfs_inc_ref(trans, root, cow, 0);



	if (ret)

		return ret;
@@ -1035,14 +1035,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, 1);

			ret = btrfs_inc_ref(trans, root, buf, 1);

			BUG_ON(ret); /* -ENOMEM */



			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID) {

				ret = btrfs_dec_ref(trans, root, buf, 0, 1);

				ret = btrfs_dec_ref(trans, root, buf, 0);

				BUG_ON(ret); /* -ENOMEM */

				ret = btrfs_inc_ref(trans, root, cow, 1, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1);

				BUG_ON(ret); /* -ENOMEM */

			}

			new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;
@@ -1050,9 +1050,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, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0, 1);

				ret = btrfs_inc_ref(trans, root, cow, 0);

			BUG_ON(ret); /* -ENOMEM */

		}

		if (new_flags != 0) {
@@ -1069,11 +1069,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, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0, 1);

				ret = btrfs_inc_ref(trans, root, cow, 0);

			BUG_ON(ret); /* -ENOMEM */

			ret = btrfs_dec_ref(trans, root, buf, 1, 1);

			ret = btrfs_dec_ref(trans, root, buf, 1);

			BUG_ON(ret); /* -ENOMEM */

		}

		clean_tree_block(trans, root, buf);

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -3326,9 +3326,9 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 num_bytes, 
			 u64 min_alloc_size, u64 empty_size, u64 hint_byte,

			 struct btrfs_key *ins, int is_data, int delalloc);

int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		  struct extent_buffer *buf, int full_backref, int no_quota);

		  struct extent_buffer *buf, int full_backref);

int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		  struct extent_buffer *buf, int full_backref, int no_quota);

		  struct extent_buffer *buf, int full_backref);

int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

				u64 bytenr, u64 num_bytes, u64 flags,

fs/btrfs/disk-io.c

+0 −32
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ static void end_workqueue_fn(struct btrfs_work *work); 
static void free_fs_root(struct btrfs_root *root);

static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,

				    int read_only);

static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t,

					     struct btrfs_root *root);

static void btrfs_destroy_ordered_extents(struct btrfs_root *root);

static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,

				      struct btrfs_root *root);
@@ -3829,34 +3827,6 @@ static void btrfs_error_commit_super(struct btrfs_root *root) 
	btrfs_cleanup_transaction(root);

}



static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t,

					     struct btrfs_root *root)

{

	struct btrfs_inode *btrfs_inode;

	struct list_head splice;



	INIT_LIST_HEAD(&splice);



	mutex_lock(&root->fs_info->ordered_operations_mutex);

	spin_lock(&root->fs_info->ordered_root_lock);



	list_splice_init(&t->ordered_operations, &splice);

	while (!list_empty(&splice)) {

		btrfs_inode = list_entry(splice.next, struct btrfs_inode,

					 ordered_operations);



		list_del_init(&btrfs_inode->ordered_operations);

		spin_unlock(&root->fs_info->ordered_root_lock);



		btrfs_invalidate_inodes(btrfs_inode->root);



		spin_lock(&root->fs_info->ordered_root_lock);

	}



	spin_unlock(&root->fs_info->ordered_root_lock);

	mutex_unlock(&root->fs_info->ordered_operations_mutex);

}



static void btrfs_destroy_ordered_extents(struct btrfs_root *root)

{

	struct btrfs_ordered_extent *ordered;
@@ -4093,8 +4063,6 @@ again: 
void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,

				   struct btrfs_root *root)

{

	btrfs_destroy_ordered_operations(cur_trans, root);



	btrfs_destroy_delayed_refs(cur_trans, root);



	cur_trans->state = TRANS_STATE_COMMIT_START;

CRA Git | Maintained and supported by SUSTech CRA and CCSE