diff options
| -rw-r--r-- | fs/btrfs/ctree.h | 3 | ||||
| -rw-r--r-- | fs/btrfs/extent-tree.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/tree-log.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 411c8d97074e..22f012d41fd0 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -2939,8 +2939,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, | |||
| 2939 | u64 num_bytes, u64 *refs, u64 *flags); | 2939 | u64 num_bytes, u64 *refs, u64 *flags); |
| 2940 | int btrfs_pin_extent(struct btrfs_root *root, | 2940 | int btrfs_pin_extent(struct btrfs_root *root, |
| 2941 | u64 bytenr, u64 num, int reserved); | 2941 | u64 bytenr, u64 num, int reserved); |
| 2942 | int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans, | 2942 | int btrfs_pin_extent_for_log_replay(struct btrfs_root *root, |
| 2943 | struct btrfs_root *root, | ||
| 2944 | u64 bytenr, u64 num_bytes); | 2943 | u64 bytenr, u64 num_bytes); |
| 2945 | int btrfs_cross_ref_exist(struct btrfs_trans_handle *trans, | 2944 | int btrfs_cross_ref_exist(struct btrfs_trans_handle *trans, |
| 2946 | struct btrfs_root *root, | 2945 | struct btrfs_root *root, |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index a162c7cb8fb5..825f23b13b58 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
| @@ -4898,8 +4898,7 @@ int btrfs_pin_extent(struct btrfs_root *root, | |||
| 4898 | /* | 4898 | /* |
| 4899 | * this function must be called within transaction | 4899 | * this function must be called within transaction |
| 4900 | */ | 4900 | */ |
| 4901 | int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans, | 4901 | int btrfs_pin_extent_for_log_replay(struct btrfs_root *root, |
| 4902 | struct btrfs_root *root, | ||
| 4903 | u64 bytenr, u64 num_bytes) | 4902 | u64 bytenr, u64 num_bytes) |
| 4904 | { | 4903 | { |
| 4905 | struct btrfs_block_group_cache *cache; | 4904 | struct btrfs_block_group_cache *cache; |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 7de720d22b74..deb7f66356bd 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -278,8 +278,7 @@ static int process_one_buffer(struct btrfs_root *log, | |||
| 278 | struct walk_control *wc, u64 gen) | 278 | struct walk_control *wc, u64 gen) |
| 279 | { | 279 | { |
| 280 | if (wc->pin) | 280 | if (wc->pin) |
| 281 | btrfs_pin_extent_for_log_replay(wc->trans, | 281 | btrfs_pin_extent_for_log_replay(log->fs_info->extent_root, |
| 282 | log->fs_info->extent_root, | ||
| 283 | eb->start, eb->len); | 282 | eb->start, eb->len); |
| 284 | 283 | ||
| 285 | if (btrfs_buffer_uptodate(eb, gen, 0)) { | 284 | if (btrfs_buffer_uptodate(eb, gen, 0)) { |
