Btrfs: extent_map and data=ordered fixes for space balancing

[safe/jmp/linux-2.6] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index cd6171c..80038c5 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -117,10 +117,14 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
                                        *objectid = last_ino;
                                        goto found;
                                }
+                       } else if (key.objectid > search_start) {
+                               *objectid = search_start;
+                               goto found;
                        }
                }
                if (key.objectid >= BTRFS_LAST_FREE_OBJECTID)
                        break;
+
                start_found = 1;
                last_ino = key.objectid + 1;
                path->slots[0]++;