Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297902
b: refs/heads/master
c: 213e64d
h: refs/heads/master
v: v3
  • Loading branch information
Ilya Dryomov committed Mar 27, 2012
1 parent b089978 commit 6f0935d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5eb56d2520fe16f00756ccdf8eebc277398e0f44
refs/heads/master: 213e64da90d14537cd63f7090d6c4d1fcc75d9f8
5 changes: 2 additions & 3 deletions trunk/fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2987,7 +2987,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
key.offset = (u64)-1;
key.type = BTRFS_DEV_EXTENT_KEY;

while (1) {
do {
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0)
goto done;
Expand Down Expand Up @@ -3029,8 +3029,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
goto done;
if (ret == -ENOSPC)
failed++;
key.offset -= 1;
}
} while (key.offset-- > 0);

if (failed && !retried) {
failed = 0;
Expand Down

0 comments on commit 6f0935d

Please sign in to comment.