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

Pull btrfs fixes and features from Chris Mason:
 "We've merged in the error handling patches from SuSE.  These are
  already shipping in the sles kernel, and they give btrfs the ability
  to abort transactions and go readonly on errors.  It involves a lot of
  churn as they clarify BUG_ONs, and remove the ones we now properly
  deal with.

  Josef reworked the way our metadata interacts with the page cache.
  page->private now points to the btrfs extent_buffer object, which
  makes everything faster.  He changed it so we write an whole extent
  buffer at a time instead of allowing individual pages to go down,,
  which will be important for the raid5/6 code (for the 3.5 merge
  window ;)

  Josef also made us more aggressive about dropping pages for metadata
  blocks that were freed due to COW.  Overall, our metadata caching is
  much faster now.

  We've integrated my patch for metadata bigger than the page size.
  This allows metadata blocks up to 64KB in size.  In practice 16K and
  32K seem to work best.  For workloads with lots of metadata, this cuts
  down the size of the extent allocation tree dramatically and fragments
  much less.

  Scrub was updated to support the larger block sizes, which ended up
  being a fairly large change (thanks Stefan Behrens).

  We also have an assortment of fixes and updates, especially to the
  balancing code (Ilya Dryomov), the back ref walker (Jan Schmidt) and
  the defragging code (Liu Bo)."

Fixed up trivial conflicts in fs/btrfs/scrub.c that were just due to
removal of the second argument to k[un]map_atomic() in commit
7ac687d9e047.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (75 commits)
  Btrfs: update the checks for mixed block groups with big metadata blocks
  Btrfs: update to the right index of defragment
  Btrfs: do not bother to defrag an extent if it is a big real extent
  Btrfs: add a check to decide if we should defrag the range
  Btrfs: fix recursive defragment with autodefrag option
  Btrfs: fix the mismatch of page->mapping
  Btrfs: fix race between direct io and autodefrag
  Btrfs: fix deadlock during allocating chunks
  Btrfs: show useful info in space reservation tracepoint
  Btrfs: don't use crc items bigger than 4KB
  Btrfs: flush out and clean up any block device pages during mount
  btrfs: disallow unequal data/metadata blocksize for mixed block groups
  Btrfs: enhance superblock sanity checks
  Btrfs: change scrub to support big blocks
  Btrfs: minor cleanup in scrub
  Btrfs: introduce common define for max number of mirrors
  Btrfs: fix infinite loop in btrfs_shrink_device()
  Btrfs: fix memory leak in resolver code
  Btrfs: allow dup for data chunks in mixed mode
  Btrfs: validate target profiles only if we are going to use them
  ...

1 files changed, 18 insertions, 20 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index b805afb37fa8..d286b40a5671 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -226,8 +226,8 @@ out:
  * Clear the writeback bits on all of the file
  * pages for a compressed write
  */
-static noinline int end_compressed_writeback(struct inode *inode, u64 start,
-                                             unsigned long ram_size)
+static noinline void end_compressed_writeback(struct inode *inode, u64 start,
+                                              unsigned long ram_size)
 {
         unsigned long index = start >> PAGE_CACHE_SHIFT;
         unsigned long end_index = (start + ram_size - 1) >> PAGE_CACHE_SHIFT;
@@ -253,7 +253,6 @@ static noinline int end_compressed_writeback(struct inode *inode, u64 start,
                 index += ret;
         }
         /* the inode may be gone now */
-        return 0;
 }
 
 /*
@@ -392,16 +391,16 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                          */
                         atomic_inc(&cb->pending_bios);
                         ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
 
                         if (!skip_sum) {
                                 ret = btrfs_csum_one_bio(root, inode, bio,
                                                          start, 1);
-                                BUG_ON(ret);
+                                BUG_ON(ret); /* -ENOMEM */
                         }
 
                         ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
 
                         bio_put(bio);
 
@@ -421,15 +420,15 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
         bio_get(bio);
 
         ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);
-        BUG_ON(ret);
+        BUG_ON(ret); /* -ENOMEM */
 
         if (!skip_sum) {
                 ret = btrfs_csum_one_bio(root, inode, bio, start, 1);
-                BUG_ON(ret);
+                BUG_ON(ret); /* -ENOMEM */
         }
 
         ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
-        BUG_ON(ret);
+        BUG_ON(ret); /* -ENOMEM */
 
         bio_put(bio);
         return 0;
@@ -497,7 +496,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                  * sure they map to this compressed extent on disk.
                  */
                 set_page_extent_mapped(page);
-                lock_extent(tree, last_offset, end, GFP_NOFS);
+                lock_extent(tree, last_offset, end);
                 read_lock(&em_tree->lock);
                 em = lookup_extent_mapping(em_tree, last_offset,
                                            PAGE_CACHE_SIZE);
@@ -507,7 +506,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                     (last_offset + PAGE_CACHE_SIZE > extent_map_end(em)) ||
                     (em->block_start >> 9) != cb->orig_bio->bi_sector) {
                         free_extent_map(em);
-                        unlock_extent(tree, last_offset, end, GFP_NOFS);
+                        unlock_extent(tree, last_offset, end);
                         unlock_page(page);
                         page_cache_release(page);
                         break;
@@ -535,7 +534,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                         nr_pages++;
                         page_cache_release(page);
                 } else {
-                        unlock_extent(tree, last_offset, end, GFP_NOFS);
+                        unlock_extent(tree, last_offset, end);
                         unlock_page(page);
                         page_cache_release(page);
                         break;
@@ -662,7 +661,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                         bio_get(comp_bio);
 
                         ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
 
                         /*
                          * inc the count before we submit the bio so
@@ -675,14 +674,14 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                         if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
                                 ret = btrfs_lookup_bio_sums(root, inode,
                                                         comp_bio, sums);
-                                BUG_ON(ret);
+                                BUG_ON(ret); /* -ENOMEM */
                         }
                         sums += (comp_bio->bi_size + root->sectorsize - 1) /
                                 root->sectorsize;
 
                         ret = btrfs_map_bio(root, READ, comp_bio,
                                             mirror_num, 0);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
 
                         bio_put(comp_bio);
 
@@ -698,15 +697,15 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         bio_get(comp_bio);
 
         ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);
-        BUG_ON(ret);
+        BUG_ON(ret); /* -ENOMEM */
 
         if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
                 ret = btrfs_lookup_bio_sums(root, inode, comp_bio, sums);
-                BUG_ON(ret);
+                BUG_ON(ret); /* -ENOMEM */
         }
 
         ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);
-        BUG_ON(ret);
+        BUG_ON(ret); /* -ENOMEM */
 
         bio_put(comp_bio);
         return 0;
@@ -734,7 +733,7 @@ struct btrfs_compress_op *btrfs_compress_op[] = {
         &btrfs_lzo_compress,
 };
 
-int __init btrfs_init_compress(void)
+void __init btrfs_init_compress(void)
 {
         int i;
 
@@ -744,7 +743,6 @@ int __init btrfs_init_compress(void)
                 atomic_set(&comp_alloc_workspace[i], 0);
                 init_waitqueue_head(&comp_workspace_wait[i]);
         }
-        return 0;
 }
 
 /*