From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 24 Sep 2009 14:00:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v2.6.32-rc1~57^2
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=54bcf382daf08c1396edb8b81e650b58930ccaef

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

Conflicts:
	fs/btrfs/super.c
---

54bcf382daf08c1396edb8b81e650b58930ccaef
diff --cc fs/btrfs/disk-io.c
index 6c4173146bb,f1e905f7e70..644e796fd64
--- a/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/super.c
index 2db17cd66fc,0242c8babae..67035385444
--- a/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,