Btrfs: properly set new buffers for new blocks up to date
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 8e1dcda..2f1eb4a 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -10,8 +10,13 @@
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;
}
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 2818f1c..c86f0e6 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -467,7 +467,7 @@
return NULL;
}
buf = find_tree_block(root, ins.objectid);
- dirty_tree_block(trans, root, buf);
+ set_buffer_uptodate(buf);
return buf;
}
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 6080a81..8970e9a 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -473,7 +473,10 @@
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);