vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix handling of non-leaf next

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-02 13:57:07 +01:00
parent eb82b8569a
commit 98042add0c
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
grub-core/fs/btrfs.c
View file

@ -215,7 +215,7 @@ save_ref (struct grub_btrfs_leaf_descriptor *desc,
grub_disk_addr_t addr, unsigned i, unsigned m, int l) grub_disk_addr_t addr, unsigned i, unsigned m, int l)
{ {
desc->depth++; desc->depth++;
if (desc->allocated > desc->depth) if (desc->allocated < desc->depth)
{ {
void *newdata; void *newdata;
desc->allocated *= 2; desc->allocated *= 2;
@ -238,21 +238,17 @@ next (struct grub_btrfs_data *data, grub_disk_t disk,
grub_disk_addr_t *outaddr, grub_size_t *outsize, grub_disk_addr_t *outaddr, grub_size_t *outsize,
struct grub_btrfs_key *key_out) struct grub_btrfs_key *key_out)
{ {
int i;
grub_err_t err; grub_err_t err;
struct grub_btrfs_leaf_node leaf; struct grub_btrfs_leaf_node leaf;
if (desc->depth == 0) for (; desc->depth > 0; desc->depth--)
return 0;
for (i = desc->depth - 1; i >= 0; i--)
{ {
desc->data[i].iter++; desc->data[desc->depth - 1].iter++;
if (desc->data[i].iter if (desc->data[desc->depth - 1].iter
< desc->data[desc->depth - 1].maxiter) < desc->data[desc->depth - 1].maxiter)
break; break;
desc->depth--;
} }
if (i == -1) if (desc->depth == 0)
return 0; return 0;
while (!desc->data[desc->depth - 1].leaf) while (!desc->data[desc->depth - 1].leaf)
{ {
@ -366,13 +362,13 @@ lower_bound (struct grub_btrfs_data *data, grub_disk_t disk,
} }
if (have_last) if (have_last)
{ {
addr = grub_le_to_cpu64 (node_last.blockn);
err = GRUB_ERR_NONE; err = GRUB_ERR_NONE;
if (desc) if (desc)
err = save_ref (desc, addr - sizeof (head), i - 1, err = save_ref (desc, addr - sizeof (head), i - 1,
grub_le_to_cpu32 (head.nitems), 0); grub_le_to_cpu32 (head.nitems), 0);
if (err) if (err)
return err; return err;
addr = grub_le_to_cpu64 (node_last.blockn);
goto reiter; goto reiter;
} }
*outsize = 0; *outsize = 0;