diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-10-15 16:14:19 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:56 -0400 |
commit | 5f39d397dfbe140a14edecd4e73c34ce23c4f9ee (patch) | |
tree | 280561e4b68d573590557dd27df656869eed8023 /fs/btrfs/super.c | |
parent | 50b78c24d594e6985f36a9a8d8e2fb74e1664e90 (diff) |
Btrfs: Create extent_buffer interface for large blocksizes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 66a01cbbbea1..39a1435c68f1 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "ioctl.h" | 41 | #include "ioctl.h" |
42 | #include "print-tree.h" | 42 | #include "print-tree.h" |
43 | 43 | ||
44 | #define BTRFS_SUPER_MAGIC 0x9123682E | 44 | #define BTRFS_SUPER_MAGIC 0x9123683E |
45 | 45 | ||
46 | static struct super_operations btrfs_super_ops; | 46 | static struct super_operations btrfs_super_ops; |
47 | 47 | ||
@@ -115,13 +115,12 @@ static int btrfs_fill_super(struct super_block * sb, void * data, int silent) | |||
115 | return -EIO; | 115 | return -EIO; |
116 | } | 116 | } |
117 | sb->s_fs_info = tree_root; | 117 | sb->s_fs_info = tree_root; |
118 | disk_super = tree_root->fs_info->disk_super; | 118 | disk_super = &tree_root->fs_info->super_copy; |
119 | inode = btrfs_iget_locked(sb, btrfs_super_root_dir(disk_super), | 119 | inode = btrfs_iget_locked(sb, btrfs_super_root_dir(disk_super), |
120 | tree_root); | 120 | tree_root); |
121 | bi = BTRFS_I(inode); | 121 | bi = BTRFS_I(inode); |
122 | bi->location.objectid = inode->i_ino; | 122 | bi->location.objectid = inode->i_ino; |
123 | bi->location.offset = 0; | 123 | bi->location.offset = 0; |
124 | bi->location.flags = 0; | ||
125 | bi->root = tree_root; | 124 | bi->root = tree_root; |
126 | 125 | ||
127 | btrfs_set_key_type(&bi->location, BTRFS_INODE_ITEM_KEY); | 126 | btrfs_set_key_type(&bi->location, BTRFS_INODE_ITEM_KEY); |
@@ -281,6 +280,7 @@ error_s: | |||
281 | error_bdev: | 280 | error_bdev: |
282 | close_bdev_excl(bdev); | 281 | close_bdev_excl(bdev); |
283 | error: | 282 | error: |
283 | printk("get_sb failed\n"); | ||
284 | return error; | 284 | return error; |
285 | } | 285 | } |
286 | /* end copy & paste */ | 286 | /* end copy & paste */ |
@@ -295,6 +295,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, | |||
295 | ret = btrfs_get_sb_bdev(fs_type, flags, dev_name, data, | 295 | ret = btrfs_get_sb_bdev(fs_type, flags, dev_name, data, |
296 | btrfs_fill_super, mnt, | 296 | btrfs_fill_super, mnt, |
297 | subvol_name ? subvol_name : "default"); | 297 | subvol_name ? subvol_name : "default"); |
298 | printk("btrfs_get_sb returns %d\n", ret); | ||
298 | return ret; | 299 | return ret; |
299 | } | 300 | } |
300 | 301 | ||