Btrfs: Add data block hints to SSD mode too

[linux-2.6-block.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 90718f77bbc07cfa78452531e05b0226a3d42828..fa54ea5900781ff1cfc13d28205663cae743d57e 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1410,6 +1410,7 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
        int ret;
        int slot = 0;
        u64 last_byte = 0;
+       u64 *last_ptr = NULL;
        u64 orig_search_start = search_start;
        int start_found;
        struct extent_buffer *l;
@@ -1433,14 +1434,17 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
 
        /* for SSD, cluster allocations together as much as possible */
        if (btrfs_test_opt(root, SSD)) {
-               if (!data) {
-                       if (root->fs_info->last_alloc)
-                               hint_byte = root->fs_info->last_alloc;
-                       else {
-                               hint_byte = hint_byte &
-                                       ~((u64)BTRFS_BLOCK_GROUP_SIZE - 1);
-                               empty_size += 16 * 1024 * 1024;
-                       }
+               if (data)
+                       last_ptr = &root->fs_info->last_data_alloc;
+               else
+                       last_ptr = &root->fs_info->last_alloc;
+               if (*last_ptr) {
+                       hint_byte = *last_ptr;
+               }
+               else {
+                       hint_byte = hint_byte &
+                               ~((u64)BTRFS_BLOCK_GROUP_SIZE - 1);
+                       empty_size += 16 * 1024 * 1024;
                }
        }
 
@@ -1470,8 +1474,8 @@ check_failed:
        search_start = find_search_start(root, &block_group, search_start,
                                         total_needed, data);
 
-       if (!data && btrfs_test_opt(root, SSD) && info->last_alloc &&
-           search_start != info->last_alloc) {
+       if (btrfs_test_opt(root, SSD) && *last_ptr &&
+           search_start != *last_ptr) {
                info->last_alloc = 0;
                if (!empty_size) {
                        empty_size += 16 * 1024 * 1024;
@@ -1609,6 +1613,8 @@ check_pending:
        }
        ins->offset = num_bytes;
        btrfs_free_path(path);
+       if (btrfs_test_opt(root, SSD))
+               *last_ptr = ins->objectid + ins->offset;
        return 0;
 
 new_group:
@@ -1636,8 +1642,6 @@ enospc:
 error:
        btrfs_release_path(root, path);
        btrfs_free_path(path);
-       if (btrfs_test_opt(root, SSD) && !ret && !data)
-               info->last_alloc = ins->objectid + ins->offset;
        return ret;
 }
 /*