diff options
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 310ab22cfe5..8ca1b6b83bd 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -276,8 +276,9 @@ static int process_one_buffer(struct btrfs_root *log, | |||
276 | struct walk_control *wc, u64 gen) | 276 | struct walk_control *wc, u64 gen) |
277 | { | 277 | { |
278 | if (wc->pin) | 278 | if (wc->pin) |
279 | btrfs_pin_extent(log->fs_info->extent_root, | 279 | btrfs_pin_extent_for_log_replay(wc->trans, |
280 | eb->start, eb->len, 0); | 280 | log->fs_info->extent_root, |
281 | eb->start, eb->len); | ||
281 | 282 | ||
282 | if (btrfs_buffer_uptodate(eb, gen)) { | 283 | if (btrfs_buffer_uptodate(eb, gen)) { |
283 | if (wc->write) | 284 | if (wc->write) |
@@ -1760,7 +1761,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, | |||
1760 | 1761 | ||
1761 | WARN_ON(root_owner != | 1762 | WARN_ON(root_owner != |
1762 | BTRFS_TREE_LOG_OBJECTID); | 1763 | BTRFS_TREE_LOG_OBJECTID); |
1763 | ret = btrfs_free_reserved_extent(root, | 1764 | ret = btrfs_free_and_pin_reserved_extent(root, |
1764 | bytenr, blocksize); | 1765 | bytenr, blocksize); |
1765 | BUG_ON(ret); | 1766 | BUG_ON(ret); |
1766 | } | 1767 | } |
@@ -1828,7 +1829,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, | |||
1828 | btrfs_tree_unlock(next); | 1829 | btrfs_tree_unlock(next); |
1829 | 1830 | ||
1830 | WARN_ON(root_owner != BTRFS_TREE_LOG_OBJECTID); | 1831 | WARN_ON(root_owner != BTRFS_TREE_LOG_OBJECTID); |
1831 | ret = btrfs_free_reserved_extent(root, | 1832 | ret = btrfs_free_and_pin_reserved_extent(root, |
1832 | path->nodes[*level]->start, | 1833 | path->nodes[*level]->start, |
1833 | path->nodes[*level]->len); | 1834 | path->nodes[*level]->len); |
1834 | BUG_ON(ret); | 1835 | BUG_ON(ret); |
@@ -1897,7 +1898,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans, | |||
1897 | 1898 | ||
1898 | WARN_ON(log->root_key.objectid != | 1899 | WARN_ON(log->root_key.objectid != |
1899 | BTRFS_TREE_LOG_OBJECTID); | 1900 | BTRFS_TREE_LOG_OBJECTID); |
1900 | ret = btrfs_free_reserved_extent(log, next->start, | 1901 | ret = btrfs_free_and_pin_reserved_extent(log, next->start, |
1901 | next->len); | 1902 | next->len); |
1902 | BUG_ON(ret); | 1903 | BUG_ON(ret); |
1903 | } | 1904 | } |