Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

Conflicts:
	fs/btrfs/super.c

diff --cc fs/btrfs/disk-io.c
index 6c4173146bb739060de46b6776b3f471250491ee,f1e905f7e7018e6f8ab689cd6e5aeb6137785f1c..644e796fd643e045ca0b0ed057743b7eb5e88438
--- 1/fs/btrfs/disk-io.c
--- 2/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@@ -1600,8 -1639,9 +1640,10 @@@ struct btrfs_root *open_ctree(struct su
  
        sb->s_blocksize = 4096;
        sb->s_blocksize_bits = blksize_bits(4096);
 +      sb->s_bdi = &fs_info->bdi;
  
+       fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID;
+       fs_info->btree_inode->i_nlink = 1;
        /*
         * we set the i_size on the btree inode to the max possible int.
         * the real end of the address space is determined by all of

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

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

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

diff --cc fs/btrfs/super.c
index 2db17cd66fc55d32ba19a77cee7ea54b170efa34,0242c8babae92e83cdfca98eb8bde41fcab6604f..67035385444cf29c31a59951311af66702fa80a8
--- 1/fs/btrfs/super.c
--- 2/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -675,7 -675,8 +675,8 @@@ static int btrfs_unfreeze(struct super_
        return 0;
  }
  
 -static struct super_operations btrfs_super_ops = {
 +static const struct super_operations btrfs_super_ops = {
+       .drop_inode     = btrfs_drop_inode,
        .delete_inode   = btrfs_delete_inode,
        .put_super      = btrfs_put_super,
        .sync_fs        = btrfs_sync_fs,

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

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