From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Apr 2014 22:31:36 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v3.15-rc1~96
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=53c566625fb872e7826a237f0f5c21458028e94a

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

Pull btrfs changes from Chris Mason:
 "This is a pretty long stream of bug fixes and performance fixes.

  Qu Wenruo has replaced the btrfs async threads with regular kernel
  workqueues.  We'll keep an eye out for performance differences, but
  it's nice to be using more generic code for this.

  We still have some corruption fixes and other patches coming in for
  the merge window, but this batch is tested and ready to go"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (108 commits)
  Btrfs: fix a crash of clone with inline extents's split
  btrfs: fix uninit variable warning
  Btrfs: take into account total references when doing backref lookup
  Btrfs: part 2, fix incremental send's decision to delay a dir move/rename
  Btrfs: fix incremental send's decision to delay a dir move/rename
  Btrfs: remove unnecessary inode generation lookup in send
  Btrfs: fix race when updating existing ref head
  btrfs: Add trace for btrfs_workqueue alloc/destroy
  Btrfs: less fs tree lock contention when using autodefrag
  Btrfs: return EPERM when deleting a default subvolume
  Btrfs: add missing kfree in btrfs_destroy_workqueue
  Btrfs: cache extent states in defrag code path
  Btrfs: fix deadlock with nested trans handles
  Btrfs: fix possible empty list access when flushing the delalloc inodes
  Btrfs: split the global ordered extents mutex
  Btrfs: don't flush all delalloc inodes when we doesn't get s_umount lock
  Btrfs: reclaim delalloc metadata more aggressively
  Btrfs: remove unnecessary lock in may_commit_transaction()
  Btrfs: remove the unnecessary flush when preparing the pages
  Btrfs: just do dirty page flush for the inode with compression before direct IO
  ...
---

53c566625fb872e7826a237f0f5c21458028e94a
diff --cc fs/btrfs/volumes.c
index bab0b84d8f80,b4660c413c73..d241130a32fd
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -5512,13 -5504,16 +5511,16 @@@ int btrfs_map_bio(struct btrfs_root *ro
  	int total_devs = 1;
  	struct btrfs_bio *bbio = NULL;
  
 -	length = bio->bi_size;
 +	length = bio->bi_iter.bi_size;
  	map_length = length;
  
+ 	btrfs_bio_counter_inc_blocked(root->fs_info);
  	ret = __btrfs_map_block(root->fs_info, rw, logical, &map_length, &bbio,
  			      mirror_num, &raid_map);
- 	if (ret) /* -ENOMEM */
+ 	if (ret) {
+ 		btrfs_bio_counter_dec(root->fs_info);
  		return ret;
+ 	}
  
  	total_devs = bbio->num_stripes;
  	bbio->orig_bio = first_bio;