From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 May 2017 15:33:17 +0000 (-0700)
Subject: Merge branch 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v4.12-rc1~44
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1176032cb12bb89ad558a3e57e82f2f25b817eff;p=linux-2.6-block.git

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

Pull btrfs updates from Chris Mason:
 "This has fixes and cleanups Dave Sterba collected for the merge
  window.

  The biggest functional fixes are between btrfs raid5/6 and scrub, and
  raid5/6 and device replacement. Some of our pending qgroup fixes are
  included as well while I bash on the rest in testing.

  We also have the usual set of cleanups, including one that makes
  __btrfs_map_block() much more maintainable, and conversions from
  atomic_t to refcount_t"

* 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (71 commits)
  btrfs: fix the gfp_mask for the reada_zones radix tree
  Btrfs: fix reported number of inode blocks
  Btrfs: send, fix file hole not being preserved due to inline extent
  Btrfs: fix extent map leak during fallocate error path
  Btrfs: fix incorrect space accounting after failure to insert inline extent
  Btrfs: fix invalid attempt to free reserved space on failure to cow range
  btrfs: Handle delalloc error correctly to avoid ordered extent hang
  btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error
  btrfs: check if the device is flush capable
  btrfs: delete unused member nobarriers
  btrfs: scrub: Fix RAID56 recovery race condition
  btrfs: scrub: Introduce full stripe lock for RAID56
  btrfs: Use ktime_get_real_ts for root ctime
  Btrfs: handle only applicable errors returned by btrfs_get_extent
  btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option
  btrfs: use q which is already obtained from bdev_get_queue
  Btrfs: switch to div64_u64 if with a u64 divisor
  Btrfs: update scrub_parity to use u64 stripe_len
  Btrfs: enable repair during read for raid56 profile
  btrfs: use clear_page where appropriate
  ...
---

1176032cb12bb89ad558a3e57e82f2f25b817eff
diff --cc fs/btrfs/qgroup.c
index afbea61d957e,3f75b5cbbfef..deffbeb74a0b
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@@ -1078,7 -1031,8 +1034,8 @@@ static int __qgroup_excl_accounting(str
  	qgroup->excl += sign * num_bytes;
  	qgroup->excl_cmpr += sign * num_bytes;
  	if (sign > 0) {
+ 		trace_qgroup_update_reserve(fs_info, qgroup, -(s64)num_bytes);
 -		if (WARN_ON(qgroup->reserved < num_bytes))
 +		if (qgroup->reserved < num_bytes)
  			report_reserved_underflow(fs_info, qgroup, num_bytes);
  		else
  			qgroup->reserved -= num_bytes;
@@@ -1103,7 -1057,9 +1060,9 @@@
  		WARN_ON(sign < 0 && qgroup->excl < num_bytes);
  		qgroup->excl += sign * num_bytes;
  		if (sign > 0) {
+ 			trace_qgroup_update_reserve(fs_info, qgroup,
+ 						    -(s64)num_bytes);
 -			if (WARN_ON(qgroup->reserved < num_bytes))
 +			if (qgroup->reserved < num_bytes)
  				report_reserved_underflow(fs_info, qgroup,
  							  num_bytes);
  			else
@@@ -2472,7 -2451,8 +2454,8 @@@ void btrfs_qgroup_free_refroot(struct b
  
  		qg = unode_aux_to_qgroup(unode);
  
+ 		trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes);
 -		if (WARN_ON(qg->reserved < num_bytes))
 +		if (qg->reserved < num_bytes)
  			report_reserved_underflow(fs_info, qg, num_bytes);
  		else
  			qg->reserved -= num_bytes;