From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2016 23:56:16 +0000 (-0400)
Subject: Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d58b0d980f0b1c27204da0e05537b606da45a07f;p=deliverable%2Flinux.git

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

Pull more btrfs updates from Chris Mason:
 "This is part two of my btrfs pull, which is some cleanups and a batch
  of fixes.

  Most of the code here is from Jeff Mahoney, making the pointers we
  pass around internally more consistent and less confusing overall.  I
  noticed a small problem right before I sent this out yesterday, so I
  fixed it up and re-tested overnight"

* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (40 commits)
  Btrfs: fix __MAX_CSUM_ITEMS
  btrfs: btrfs_abort_transaction, drop root parameter
  btrfs: add btrfs_trans_handle->fs_info pointer
  btrfs: btrfs_relocate_chunk pass extent_root to btrfs_end_transaction
  btrfs: convert nodesize macros to static inlines
  btrfs: introduce BTRFS_MAX_ITEM_SIZE
  btrfs: cleanup, remove prototype for btrfs_find_root_ref
  btrfs: copy_to_sk drop unused root parameter
  btrfs: simpilify btrfs_subvol_inherit_props
  btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root
  btrfs: tests, require fs_info for root
  btrfs: tests, move initialization into tests/
  btrfs: btrfs_test_opt and friends should take a btrfs_fs_info
  btrfs: prefix fsid to all trace events
  btrfs: plumb fs_info into btrfs_work
  btrfs: remove obsolete part of comment in statfs
  btrfs: hide test-only member under ifdef
  btrfs: Ratelimit "no csum found" info message
  btrfs: Add ratelimit to btrfs printing
  Btrfs: fix unexpected balance crash due to BUG_ON
  ...
---

d58b0d980f0b1c27204da0e05537b606da45a07f
diff --cc fs/btrfs/compression.c
index cefedabf0a92,7a4d9c81aa2a..029db6e1105c
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@@ -402,8 -401,11 +402,11 @@@ int btrfs_submit_compressed_write(struc
  				BUG_ON(ret); /* -ENOMEM */
  			}
  
 -			ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
 +			ret = btrfs_map_bio(root, bio, 0, 1);
- 			BUG_ON(ret); /* -ENOMEM */
+ 			if (ret) {
+ 				bio->bi_error = ret;
+ 				bio_endio(bio);
+ 			}
  
  			bio_put(bio);
  
@@@ -433,8 -434,11 +436,11 @@@
  		BUG_ON(ret); /* -ENOMEM */
  	}
  
 -	ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
 +	ret = btrfs_map_bio(root, bio, 0, 1);
- 	BUG_ON(ret); /* -ENOMEM */
+ 	if (ret) {
+ 		bio->bi_error = ret;
+ 		bio_endio(bio);
+ 	}
  
  	bio_put(bio);
  	return 0;
diff --cc fs/btrfs/extent_io.c
index cee4cb99b8ce,dae2f8470e04..80d92839d119
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2754,9 -2754,8 +2754,8 @@@ static int merge_bio(struct extent_io_t
  {
  	int ret = 0;
  	if (tree->ops && tree->ops->merge_bio_hook)
 -		ret = tree->ops->merge_bio_hook(rw, page, offset, size, bio,
 +		ret = tree->ops->merge_bio_hook(page, offset, size, bio,
  						bio_flags);
- 	BUG_ON(ret < 0);
  	return ret;
  
  }
@@@ -5235,9 -5244,19 +5243,19 @@@ int read_extent_buffer_pages(struct ext
  			err = __extent_read_full_page(tree, page,
  						      get_extent, &bio,
  						      mirror_num, &bio_flags,
 -						      READ | REQ_META);
 +						      REQ_META);
- 			if (err)
+ 			if (err) {
  				ret = err;
+ 				/*
+ 				 * We use &bio in above __extent_read_full_page,
+ 				 * so we ensure that if it returns error, the
+ 				 * current page fails to add itself to bio and
+ 				 * it's been unlocked.
+ 				 *
+ 				 * We must dec io_pages by ourselves.
+ 				 */
+ 				atomic_dec(&eb->io_pages);
+ 			}
  		} else {
  			unlock_page(page);
  		}
diff --cc fs/btrfs/inode.c
index 8078077d1090,72cfd15b1fa8..b0f421f332ae
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -1822,8 -1826,12 +1826,12 @@@ static void btrfs_clear_bit_hook(struc
  /*
   * extent_io.c merge_bio_hook, this must check the chunk tree to make sure
   * we don't create bios that span stripes or chunks
+  *
+  * return 1 if page cannot be merged to bio
+  * return 0 if page can be merged to bio
+  * return error otherwise
   */
 -int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset,
 +int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
  			 size_t size, struct bio *bio,
  			 unsigned long bio_flags)
  {
@@@ -1838,10 -1846,10 +1846,10 @@@
  
  	length = bio->bi_iter.bi_size;
  	map_length = length;
 -	ret = btrfs_map_block(root->fs_info, rw, logical,
 +	ret = btrfs_map_block(root->fs_info, bio_op(bio), logical,
  			      &map_length, NULL, 0);
- 	/* Will always return 0 with map_multi == NULL */
- 	BUG_ON(ret < 0);
+ 	if (ret < 0)
+ 		return ret;
  	if (map_length < length + size)
  		return 1;
  	return 0;