Skip to content

Commit

Permalink
Btrfs: properly set new buffers for new blocks up to date
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Chris Mason authored and David Woodhouse committed Mar 23, 2007
1 parent d571976 commit df2ce34
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
9 changes: 7 additions & 2 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ static int check_tree_block(struct btrfs_root *root, struct buffer_head *buf)
if (buf->b_blocknr != btrfs_header_blocknr(&node->header))
BUG();
if (root->node && btrfs_header_parentid(&node->header) !=
btrfs_header_parentid(btrfs_buffer_header(root->node)))
BUG();
btrfs_header_parentid(btrfs_buffer_header(root->node))) {
printk("block %Lu parentids don't match buf %Lu, root %Lu\n",
buf->b_blocknr,
btrfs_header_parentid(&node->header),
btrfs_header_parentid(btrfs_buffer_header(root->node)));
WARN_ON(1);
}
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
return NULL;
}
buf = find_tree_block(root, ins.objectid);
dirty_tree_block(trans, root, buf);
set_buffer_uptodate(buf);
return buf;
}

Expand Down
3 changes: 3 additions & 0 deletions fs/btrfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,10 @@ static int btrfs_sync_fs(struct super_block *sb, int wait)
struct btrfs_trans_handle *trans;
struct btrfs_root *root;
int ret;

sb->s_dirt = 0;
return 0;

root = btrfs_sb(sb);
trans = btrfs_start_transaction(root, 1);
ret = btrfs_commit_transaction(trans, root);
Expand Down

0 comments on commit df2ce34

Please sign in to comment.