Btrfs: crash recovery fixes

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 14 insertions, 8 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7081729d5b16..d1bf5bc1bc14 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -270,14 +270,6 @@ fail:
         return NULL;
 }
 
-int dirty_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-                     struct buffer_head *buf)
-{
-        WARN_ON(atomic_read(&buf->b_count) == 0);
-        mark_buffer_dirty(buf);
-        return 0;
-}
-
 int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                      struct buffer_head *buf)
 {
@@ -621,6 +613,20 @@ int close_ctree(struct btrfs_root *root)
         return 0;
 }
 
+void btrfs_mark_buffer_dirty(struct buffer_head *bh)
+{
+        struct btrfs_root *root = BTRFS_I(bh->b_page->mapping->host)->root;
+        u64 transid = btrfs_header_generation(btrfs_buffer_header(bh));
+        WARN_ON(!atomic_read(&bh->b_count));
+        if (transid != root->fs_info->generation) {
+                printk(KERN_CRIT "transid mismatch buffer %llu, found %Lu running %Lu\n",
+                        (unsigned long long)bh->b_blocknr,
+                        transid, root->fs_info->generation);
+                WARN_ON(1);
+        }
+        mark_buffer_dirty(bh);
+}
+
 void btrfs_block_release(struct btrfs_root *root, struct buffer_head *buf)
 {
         brelse(buf);