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

Commit 318e1510 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 fixes from Chris Mason:
 "I've split out the big send/receive update from my last pull request
  and now have just the fixes in my for-linus branch.  The send/recv
  branch will wander over to linux-next shortly though.

  The largest patches in this pull are Josef's patches to fix DIO
  locking problems and his patch to fix a crash during balance.  They
  are both well tested.

  The rest are smaller fixes that we've had queued.  The last rc came
  out while I was hacking new and exciting ways to recover from a
  misplaced rm -rf on my dev box, so these missed rc3."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
  Btrfs: fix that repair code is spuriously executed for transid failures
  Btrfs: fix ordered extent leak when failing to start a transaction
  Btrfs: fix a dio write regression
  Btrfs: fix deadlock with freeze and sync V2
  Btrfs: revert checksum error statistic which can cause a BUG()
  Btrfs: remove superblock writing after fatal error
  Btrfs: allow delayed refs to be merged
  Btrfs: fix enospc problems when deleting a subvol
  Btrfs: fix wrong mtime and ctime when creating snapshots
  Btrfs: fix race in run_clustered_refs
  Btrfs: don't run __tree_mod_log_free_eb on leaves
  Btrfs: increase the size of the free space cache
  Btrfs: barrier before waitqueue_active
  Btrfs: fix deadlock in wait_for_more_refs
  btrfs: fix second lock in btrfs_delete_delayed_items()
  Btrfs: don't allocate a seperate csums array for direct reads
  Btrfs: do not strdup non existent strings
  Btrfs: do not use missing devices when showing devname
  Btrfs: fix that error value is changed by mistake
  Btrfs: lock extents as we map them in DIO
  ...
parents a7ccbcf3 256dd1bb

fs/btrfs/backref.c

+2 −2
Original line number Diff line number Diff line
@@ -1438,10 +1438,10 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info, 
	ret = extent_from_logical(fs_info, logical, path,

					&found_key);

	btrfs_release_path(path);

	if (ret & BTRFS_EXTENT_FLAG_TREE_BLOCK)

		ret = -EINVAL;

	if (ret < 0)

		return ret;

	if (ret & BTRFS_EXTENT_FLAG_TREE_BLOCK)

		return -EINVAL;



	extent_item_pos = logical - found_key.objectid;

	ret = iterate_extent_inodes(fs_info, found_key.objectid,

fs/btrfs/compression.c

+1 −0
Original line number Diff line number Diff line
@@ -818,6 +818,7 @@ static void free_workspace(int type, struct list_head *workspace) 
	btrfs_compress_op[idx]->free_workspace(workspace);

	atomic_dec(alloc_workspace);

wake:

	smp_mb();

	if (waitqueue_active(workspace_wait))

		wake_up(workspace_wait);

}

fs/btrfs/ctree.c

+3 −6
Original line number Diff line number Diff line
@@ -420,12 +420,6 @@ void btrfs_put_tree_mod_seq(struct btrfs_fs_info *fs_info, 
	}

	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.
@@ -631,6 +625,9 @@ __tree_mod_log_free_eb(struct btrfs_fs_info *fs_info, struct extent_buffer *eb) 
	u32 nritems;

	int ret;



	if (btrfs_header_level(eb) == 0)

		return;



	nritems = btrfs_header_nritems(eb);

	for (i = nritems - 1; i >= 0; i--) {

		ret = tree_mod_log_insert_key_locked(fs_info, eb, i,

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,6 @@ struct btrfs_fs_info { 
	atomic_t tree_mod_seq;

	struct list_head tree_mod_seq_list;

	struct seq_list tree_mod_seq_elem;

	wait_queue_head_t tree_mod_seq_wait;



	/* this protects tree_mod_log */

	rwlock_t tree_mod_log_lock;
@@ -3192,7 +3191,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans, 
int btrfs_lookup_bio_sums(struct btrfs_root *root, struct inode *inode,

			  struct bio *bio, u32 *dst);

int btrfs_lookup_bio_sums_dio(struct btrfs_root *root, struct inode *inode,

			      struct bio *bio, u64 logical_offset, u32 *dst);

			      struct bio *bio, u64 logical_offset);

int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root,

			     u64 objectid, u64 pos,

fs/btrfs/delayed-inode.c

+6 −6
Original line number Diff line number Diff line
@@ -512,8 +512,8 @@ static void __btrfs_remove_delayed_item(struct btrfs_delayed_item *delayed_item) 


	rb_erase(&delayed_item->rb_node, root);

	delayed_item->delayed_node->count--;

	atomic_dec(&delayed_root->items);

	if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND &&

	if (atomic_dec_return(&delayed_root->items) <

	    BTRFS_DELAYED_BACKGROUND &&

	    waitqueue_active(&delayed_root->wait))

		wake_up(&delayed_root->wait);

}
@@ -1028,9 +1028,10 @@ static int btrfs_delete_delayed_items(struct btrfs_trans_handle *trans, 
		btrfs_release_delayed_item(prev);

		ret = 0;

		btrfs_release_path(path);

		if (curr)

		if (curr) {

			mutex_unlock(&node->mutex);

			goto do_again;

		else

		} else

			goto delete_fail;

	}
@@ -1055,8 +1056,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node) 
		delayed_node->count--;



		delayed_root = delayed_node->root->fs_info->delayed_root;

		atomic_dec(&delayed_root->items);

		if (atomic_read(&delayed_root->items) <

		if (atomic_dec_return(&delayed_root->items) <

		    BTRFS_DELAYED_BACKGROUND &&

		    waitqueue_active(&delayed_root->wait))

			wake_up(&delayed_root->wait);