From 28b8bb9e001aa1c4abdd10a8e36972658237fe43 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 27 Apr 2007 11:42:05 -0400
Subject: [PATCH] Btrfs: allocator tweaks
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---
fs/btrfs/disk-io.c | 3 ---
fs/btrfs/extent-tree.c | 7 +++++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2489ffa5fb38..e1b6e13a5ae8 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -94,9 +94,6 @@ struct buffer_head *btrfs_find_tree_block(struct btrfs_root *root, u64 blocknr)
} while (bh != head);
out_unlock:
unlock_page(page);
- if (ret) {
- touch_buffer(ret);
- }
page_cache_release(page);
return ret;
}
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 71e3b311fc42..aca5802a8a1e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -311,7 +311,10 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
clear_radix_bit(pinned_radix, gang[i]);
}
}
- root->fs_info->block_group_cache = NULL;
+ if (root->fs_info->block_group_cache) {
+ root->fs_info->block_group_cache->last_alloc =
+ root->fs_info->block_group_cache->first_free;
+ }
return 0;
}
@@ -578,7 +581,7 @@ check_failed:
if (last_block < search_start)
last_block = search_start;
hole_size = key.objectid - last_block;
- if (hole_size > num_blocks) {
+ if (hole_size >= num_blocks) {
ins->objectid = last_block;
ins->offset = hole_size;
goto check_pending;
--
2.34.1