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;