summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Zheng <zheng.yan@oracle.com>2009-07-24 11:06:53 -0400
committerChris Mason <chris.mason@oracle.com>2009-07-24 11:22:47 -0400
commit1fcbac581be375ca0a686f72ee2b7fd1dbf386e7 (patch)
tree64789d4143fdb02acd428ec928ed18239c95c37b
parent20736abaa361bea488df6a1f66f6b37fb01107b9 (diff)
downloadop-kernel-dev-1fcbac581be375ca0a686f72ee2b7fd1dbf386e7.zip
op-kernel-dev-1fcbac581be375ca0a686f72ee2b7fd1dbf386e7.tar.gz
Btrfs: find_free_dev_extent doesn't handle holes at the start of the device
find_free_dev_extent does not properly handle the case where the device is not complete free, and there is a free extent at the beginning of the device. Signed-off-by: Yan Zheng <zheng.yan@oracle.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/volumes.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 55c3727..074c1c5 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -758,9 +758,13 @@ static noinline int find_free_dev_extent(struct btrfs_trans_handle *trans,
ret = btrfs_search_slot(trans, root, &key, path, 0, 0);
if (ret < 0)
goto error;
- ret = btrfs_previous_item(root, path, 0, key.type);
- if (ret < 0)
- goto error;
+ if (ret > 0) {
+ ret = btrfs_previous_item(root, path, key.objectid, key.type);
+ if (ret < 0)
+ goto error;
+ if (ret > 0)
+ start_found = 1;
+ }
l = path->nodes[0];
btrfs_item_key_to_cpu(l, &key, path->slots[0]);
while (1) {
OpenPOWER on IntegriCloud