Merge branch 'cleanups-4.7' into for-chris-4.7-20160525

diff --cc fs/btrfs/backref.c
Simple merge

diff --cc fs/btrfs/btrfs_inode.h
Simple merge

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/ctree.h
index ddcc58f03c79c229314bec522ef1aab8d2b570a7,65e7a9fa881fcc2811c5eb93616448c8e349046d..101c3cfd3f7cddd43e07462fd74ebfb06cb4039e
--- 1/fs/btrfs/ctree.h
--- 2/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@@ -89,9 -186,20 +89,9 @@@ static const int btrfs_csum_sizes[] = 
  /* four bytes for CRC32 */
  #define BTRFS_EMPTY_DIR_SIZE 0
  
- /* spefic to btrfs_map_block(), therefore not in include/linux/blk_types.h */
+ /* specific to btrfs_map_block(), therefore not in include/linux/blk_types.h */
  #define REQ_GET_READ_MIRRORS  (1 << 30)
  
 -#define BTRFS_FT_UNKNOWN      0
 -#define BTRFS_FT_REG_FILE     1
 -#define BTRFS_FT_DIR          2
 -#define BTRFS_FT_CHRDEV               3
 -#define BTRFS_FT_BLKDEV               4
 -#define BTRFS_FT_FIFO         5
 -#define BTRFS_FT_SOCK         6
 -#define BTRFS_FT_SYMLINK      7
 -#define BTRFS_FT_XATTR                8
 -#define BTRFS_FT_MAX          9
 -
  /* ioprio of readahead is set to idle */
  #define BTRFS_IOPRIO_READA (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0))
  

diff --cc fs/btrfs/dev-replace.c
index 85f12e6e28d212368af44fbafc1e22442f89dccf,0584b6c2df572924a747560c3cb0f903bc0ba99a..63ef9cdf0144dd00f226d1a98069f58b916f2dc4
--- 1/fs/btrfs/dev-replace.c
--- 2/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@@ -420,37 -440,8 +420,37 @@@ leave
        return ret;
  }
  
 +int btrfs_dev_replace_by_ioctl(struct btrfs_root *root,
 +                          struct btrfs_ioctl_dev_replace_args *args)
 +{
 +      int ret;
 +
 +      switch (args->start.cont_reading_from_srcdev_mode) {
 +      case BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_ALWAYS:
 +      case BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_AVOID:
 +              break;
 +      default:
 +              return -EINVAL;
 +      }
 +
 +      if ((args->start.srcdevid == 0 && args->start.srcdev_name[0] == '\0') ||
 +          args->start.tgtdev_name[0] == '\0')
 +              return -EINVAL;
 +
 +      ret = btrfs_dev_replace_start(root, args->start.tgtdev_name,
 +                                      args->start.srcdevid,
 +                                      args->start.srcdev_name,
 +                                      args->start.cont_reading_from_srcdev_mode);
 +      args->result = ret;
 +      /* don't warn if EINPROGRESS, someone else might be running scrub */
 +      if (ret == BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS)
 +              ret = 0;
 +
 +      return ret;
 +}
 +
  /*
-  * blocked until all flighting bios are finished.
+  * blocked until all in-flight bios operations are finished.
   */
  static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info)
  {

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/extent_io.h
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/ioctl.c
index 73c0be77b4bdc5be262251d89b30d997a3884def,972cd0b00b219f99cce301d1079bf497ce91cbf3..e6714e209d0f376a9ba07b9bc5061f0295993549
--- 1/fs/btrfs/ioctl.c
--- 2/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@@ -465,12 -461,10 +465,12 @@@ static noinline int create_subvol(struc
  
        /*
         * Don't create subvolume whose level is not zero. Or qgroup will be
-        * screwed up since it assume subvolme qgroup's level to be 0.
+        * screwed up since it assumes subvolume qgroup's level to be 0.
         */
 -      if (btrfs_qgroup_level(objectid))
 -              return -ENOSPC;
 +      if (btrfs_qgroup_level(objectid)) {
 +              ret = -ENOSPC;
 +              goto fail_free;
 +      }
  
        btrfs_init_block_rsv(&block_rsv, BTRFS_BLOCK_RSV_TEMP);
        /*

diff --cc fs/btrfs/ordered-data.h
Simple merge

diff --cc fs/btrfs/relocation.c
Simple merge

diff --cc fs/btrfs/root-tree.c
Simple merge

diff --cc fs/btrfs/scrub.c
Simple merge

diff --cc fs/btrfs/send.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge

diff --cc fs/btrfs/tree-log.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge