[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/9] btrfs: move logging code in grub_btrfs_read_logical()
From: |
Goffredo Baroncelli |
Subject: |
[PATCH 5/9] btrfs: move logging code in grub_btrfs_read_logical() |
Date: |
Wed, 16 May 2018 20:48:15 +0200 |
A portion of the logging code is moved outside a for(;;). The part that is
left inside is the one which depends by the for(;;) index.
This is a preparatory patch: in the next one it will be possible to refactor
the code inside the for(;;) in an another function.
---
grub-core/fs/btrfs.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 4920dd3b1..51f300829 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -865,6 +865,18 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
grub_disk_addr_t addr,
for (j = 0; j < 2; j++)
{
+ grub_dprintf ("btrfs", "chunk 0x%" PRIxGRUB_UINT64_T
+ "+0x%" PRIxGRUB_UINT64_T
+ " (%d stripes (%d substripes) of %"
+ PRIxGRUB_UINT64_T ") \n",
+ grub_le_to_cpu64 (key->offset),
+ grub_le_to_cpu64 (chunk->size),
+ grub_le_to_cpu16 (chunk->nstripes),
+ grub_le_to_cpu16 (chunk->nsubstripes),
+ grub_le_to_cpu64 (chunk->stripe_length));
+ grub_dprintf ("btrfs", "reading laddr 0x%" PRIxGRUB_UINT64_T "\n",
+ addr);
+
for (i = 0; i < redundancy; i++)
{
struct grub_btrfs_chunk_stripe *stripe;
@@ -877,20 +889,11 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
grub_disk_addr_t addr,
paddr = grub_le_to_cpu64 (stripe->offset) + stripe_offset;
- grub_dprintf ("btrfs", "chunk 0x%" PRIxGRUB_UINT64_T
- "+0x%" PRIxGRUB_UINT64_T
- " (%d stripes (%d substripes) of %"
- PRIxGRUB_UINT64_T ") stripe %" PRIxGRUB_UINT64_T
+ grub_dprintf ("btrfs", "stripe %" PRIxGRUB_UINT64_T
" maps to 0x%" PRIxGRUB_UINT64_T "\n",
- grub_le_to_cpu64 (key->offset),
- grub_le_to_cpu64 (chunk->size),
- grub_le_to_cpu16 (chunk->nstripes),
- grub_le_to_cpu16 (chunk->nsubstripes),
- grub_le_to_cpu64 (chunk->stripe_length),
stripen, stripe->offset);
grub_dprintf ("btrfs", "reading paddr 0x%" PRIxGRUB_UINT64_T
- " for laddr 0x%" PRIxGRUB_UINT64_T "\n", paddr,
- addr);
+ "\n", paddr);
dev = find_device (data, stripe->device_id);
if (!dev)
--
2.17.0
- [PATCH V4] Add support for BTRFS raid5/6 to GRUB, Goffredo Baroncelli, 2018/05/16
- [PATCH 1/9] btrfs: add support for reading a filesystem with a RAID 5 or RAID 6 profile., Goffredo Baroncelli, 2018/05/16
- [PATCH 2/9] btrfs: add helper to check the btrfs header., Goffredo Baroncelli, 2018/05/16
- [PATCH 5/9] btrfs: move logging code in grub_btrfs_read_logical(),
Goffredo Baroncelli <=
- [PATCH 6/9] btrfs: refactor the code that read from disk, Goffredo Baroncelli, 2018/05/16
- [PATCH 3/9] btrfs: move the error logging from find_device() to its callee., Goffredo Baroncelli, 2018/05/16
- [PATCH 4/9] btrfs: avoiding a rescan for a device which was already not founded., Goffredo Baroncelli, 2018/05/16
- [PATCH 7/9] btrfs: add support for recovery for a RAID 5 btrfs profiles., Goffredo Baroncelli, 2018/05/16
- [PATCH 8/9] btrfs: make more generic the code for RAID 6 rebuilding, Goffredo Baroncelli, 2018/05/16