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

Pull btrfs updates from Chris Mason:
 "We have a good sized cleanup of our internal read ahead code, and the
  first series of commits from Chandan to enable PAGE_SIZE > sectorsize

  Otherwise, it's a normal series of cleanups and fixes, with many
  thanks to Dave Sterba for doing most of the patch wrangling this time"

* 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (82 commits)
  btrfs: make sure we stay inside the bvec during __btrfs_lookup_bio_sums
  btrfs: Fix misspellings in comments.
  btrfs: Print Warning only if ENOSPC_DEBUG is enabled
  btrfs: scrub: silence an uninitialized variable warning
  btrfs: move btrfs_compression_type to compression.h
  btrfs: rename btrfs_print_info to btrfs_print_mod_info
  Btrfs: Show a warning message if one of objectid reaches its highest value
  Documentation: btrfs: remove usage specific information
  btrfs: use kbasename in btrfsic_mount
  Btrfs: do not collect ordered extents when logging that inode exists
  Btrfs: fix race when checking if we can skip fsync'ing an inode
  Btrfs: fix listxattrs not listing all xattrs packed in the same item
  Btrfs: fix deadlock between direct IO reads and buffered writes
  Btrfs: fix extent_same allowing destination offset beyond i_size
  Btrfs: fix file loss on log replay after renaming a file and fsync
  Btrfs: fix unreplayable log after snapshot delete + parent dir fsync
  Btrfs: fix lockdep deadlock warning due to dev_replace
  btrfs: drop unused argument in btrfs_ioctl_get_supported_features
  btrfs: add GET_SUPPORTED_FEATURES to the control device ioctls
  btrfs: change max_inline default to 2048
  ...

1 files changed, 21 insertions, 2 deletions

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 647ab12fdf5d..147dc6ca5de1 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -295,8 +295,27 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                                btrfs_dev_extent_chunk_offset(l, dev_extent),
                                btrfs_dev_extent_length(l, dev_extent));
                         break;
-                case BTRFS_DEV_STATS_KEY:
-                        printk(KERN_INFO "\t\tdevice stats\n");
+                case BTRFS_PERSISTENT_ITEM_KEY:
+                        printk(KERN_INFO "\t\tpersistent item objectid %llu offset %llu\n",
+                                        key.objectid, key.offset);
+                        switch (key.objectid) {
+                        case BTRFS_DEV_STATS_OBJECTID:
+                                printk(KERN_INFO "\t\tdevice stats\n");
+                                break;
+                        default:
+                                printk(KERN_INFO "\t\tunknown persistent item\n");
+                        }
+                        break;
+                case BTRFS_TEMPORARY_ITEM_KEY:
+                        printk(KERN_INFO "\t\ttemporary item objectid %llu offset %llu\n",
+                                        key.objectid, key.offset);
+                        switch (key.objectid) {
+                        case BTRFS_BALANCE_OBJECTID:
+                                printk(KERN_INFO "\t\tbalance status\n");
+                                break;
+                        default:
+                                printk(KERN_INFO "\t\tunknown temporary item\n");
+                        }
                         break;
                 case BTRFS_DEV_REPLACE_KEY:
                         printk(KERN_INFO "\t\tdev replace\n");