aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-03-23 10:01:08 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-03-23 10:01:08 -0400
commitd571976292839cec05a2820b08f7629b145ed157 (patch)
tree6a3f2f5a9b9c70f61d00ac10edaaaa60d5043474 /fs/btrfs/disk-io.c
parent79154b1b5bcf87903db7ff16a30b360b78d6fe4f (diff)
btrfs_create, btrfs_write_super, btrfs_sync_fs
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 9cacca0c525..8e1dcda0839 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -145,19 +145,20 @@ struct btrfs_root *open_ctree(struct super_block *sb,
int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
*root)
{
- return 0;
-#if 0
- int ret;
- btrfs_set_super_root(s, root->fs_info->tree_root->node->b_blocknr);
-
- ret = pwrite(root->fs_info->fp, s, sizeof(*s),
- BTRFS_SUPER_INFO_OFFSET);
- if (ret != sizeof(*s)) {
- fprintf(stderr, "failed to write new super block err %d\n", ret);
- return ret;
+ struct buffer_head *bh = root->fs_info->sb_buffer;
+ btrfs_set_super_root(root->fs_info->disk_super,
+ root->fs_info->tree_root->node->b_blocknr);
+ lock_buffer(bh);
+ clear_buffer_dirty(bh);
+ bh->b_end_io = end_buffer_write_sync;
+ get_bh(bh);
+ submit_bh(WRITE, bh);
+ wait_on_buffer(bh);
+ if (!buffer_uptodate(bh)) {
+ WARN_ON(1);
+ return -EIO;
}
return 0;
-#endif
}
int close_ctree(struct btrfs_root *root)