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

btrfs: Refactor the code that read from disk

Browse source 
Move the code in charge to read the data from disk into a separate
function. This helps to separate the error handling logic (which
depends on the different raid profiles) from the read from disk
logic. Refactoring this code increases the general readability too.

This is a preparatory patch, to help the adding of the RAID 5/6 recovery code.

Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Goffredo Baroncelli 2018-10-22 19:29:36 +02:00 committed by Daniel Kiper
parent c6f79aca80
commit c743736048
1 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -625,6 +625,46 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id)
return ctx.dev_found;
}
static grub_err_t
btrfs_read_from_chunk (struct grub_btrfs_data *data,
struct grub_btrfs_chunk_item *chunk,
grub_uint64_t stripen, grub_uint64_t stripe_offset,
int redundancy, grub_uint64_t csize,
void *buf)
{
struct grub_btrfs_chunk_stripe *stripe;
grub_disk_addr_t paddr;
grub_device_t dev;
grub_err_t err;
stripe = (struct grub_btrfs_chunk_stripe *) (chunk + 1);
/* Right now the redundancy handling is easy.
With RAID5-like it will be more difficult. */
stripe += stripen + redundancy;
paddr = grub_le_to_cpu64 (stripe->offset) + stripe_offset;
grub_dprintf ("btrfs", "stripe %" PRIxGRUB_UINT64_T
" maps to 0x%" PRIxGRUB_UINT64_T "\n"
"reading paddr 0x%" PRIxGRUB_UINT64_T "\n",
stripen, stripe->offset, paddr);
dev = find_device (data, stripe->device_id);
if (!dev)
{
grub_dprintf ("btrfs",
"couldn't find a necessary member device "
"of multi-device filesystem\n");
grub_errno = GRUB_ERR_NONE;
return GRUB_ERR_READ_ERROR;
}
err = grub_disk_read (dev->disk, paddr >> GRUB_DISK_SECTOR_BITS,
paddr & (GRUB_DISK_SECTOR_SIZE - 1),
csize, buf);
return err;
}
static grub_err_t
grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
void *buf, grub_size_t size, int recursion_depth)
@ -638,7 +678,6 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
grub_err_t err = 0;
struct grub_btrfs_key key_out;
int challoc = 0;
grub_device_t dev;
struct grub_btrfs_key key_in;
grub_size_t chsize;
grub_disk_addr_t chaddr;
@ -884,35 +923,9 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
for (i = 0; i < redundancy; i++)
{
struct grub_btrfs_chunk_stripe *stripe;
grub_disk_addr_t paddr;
stripe = (struct grub_btrfs_chunk_stripe *) (chunk + 1);
/* Right now the redundancy handling is easy.
With RAID5-like it will be more difficult. */
stripe += stripen + i;
paddr = grub_le_to_cpu64 (stripe->offset) + stripe_offset;
grub_dprintf ("btrfs", "stripe %" PRIxGRUB_UINT64_T
" maps to 0x%" PRIxGRUB_UINT64_T "\n",
stripen, stripe->offset);
grub_dprintf ("btrfs", "reading paddr 0x%" PRIxGRUB_UINT64_T "\n",
paddr);
dev = find_device (data, stripe->device_id);
if (!dev)
{
grub_dprintf ("btrfs",
"couldn't find a necessary member device "
"of multi-device filesystem\n");
err = grub_errno;
grub_errno = GRUB_ERR_NONE;
continue;
}
err = grub_disk_read (dev->disk, paddr >> GRUB_DISK_SECTOR_BITS,
paddr & (GRUB_DISK_SECTOR_SIZE - 1),
err = btrfs_read_from_chunk (data, chunk, stripen,
stripe_offset,
i, /* redundancy */
csize, buf);
if (!err)
break;