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

* grub-core/fs/btrfs.c: Fix code style regressions.

Browse source
This commit is contained in:
Szymon Janc 2011-10-03 21:50:32 +02:00
parent 9c4f9ca010
commit 139d67a82f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,8 +330,8 @@ next (struct grub_btrfs_data *data,
for (; desc->depth > 0; desc->depth--) for (; desc->depth > 0; desc->depth--)
{ {
desc->data[desc->depth - 1].iter++; desc->data[desc->depth - 1].iter++;
if (desc->data[desc->depth - 1].iter < if (desc->data[desc->depth - 1].iter
desc->data[desc->depth - 1].maxiter) < desc->data[desc->depth - 1].maxiter)
break; break;
} }
if (desc->depth == 0) if (desc->depth == 0)
@ -626,8 +626,8 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
grub_le_to_cpu64 (key->offset), grub_le_to_cpu64 (key->offset),
grub_le_to_cpu64 (chunk->size)); grub_le_to_cpu64 (chunk->size));
if (grub_le_to_cpu64 (key->offset) <= addr if (grub_le_to_cpu64 (key->offset) <= addr
&& addr < && addr < grub_le_to_cpu64 (key->offset)
grub_le_to_cpu64 (key->offset) + grub_le_to_cpu64 (chunk->size)) + grub_le_to_cpu64 (chunk->size))
goto chunk_found; goto chunk_found;
ptr += sizeof (*key) + sizeof (*chunk) ptr += sizeof (*key) + sizeof (*chunk)
+ sizeof (struct grub_btrfs_chunk_stripe) + sizeof (struct grub_btrfs_chunk_stripe)
@ -1007,8 +1007,8 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
data->extend = data->extstart + grub_le_to_cpu64 (data->extent->size); data->extend = data->extstart + grub_le_to_cpu64 (data->extent->size);
if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR
&& (char *) &data->extent + elemsize >= && (char *) &data->extent + elemsize
(char *) &data->extent->filled + sizeof (data->extent->filled)) >= (char *) &data->extent->filled + sizeof (data->extent->filled))
data->extend = data->extend =
data->extstart + grub_le_to_cpu64 (data->extent->filled); data->extstart + grub_le_to_cpu64 (data->extent->filled);