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-Url: https://git.stricted.de/?a=commitdiff_plain;h=54bcf382daf08c1396edb8b81e650b58930ccaef;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git
Merge branch 'master' of git://git./linux/kernel/git/mason/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/super.c
---
54bcf382daf08c1396edb8b81e650b58930ccaef
diff --cc fs/btrfs/disk-io.c
index 6c4173146bb7,f1e905f7e701..644e796fd643
--- 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 2db17cd66fc5,0242c8babae9..67035385444c
--- 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,