btrfs: Move logging code in grub_btrfs_read_logical()

A portion of the logging code is moved outside of internal for(;;). The part
that is left inside is the one which depends on the internal for(;;) index.

This is a preparatory patch. The next one will refactor the code inside
the for(;;) into an another function.

Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index ca0277beeade8c77f9ca509a94c8e43d7fcf34ba..4e529219715c730315dd4e354028c287a255e2f0 100644 (file)
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -870,6 +870,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;
@@ -882,20 +894,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);
+               grub_dprintf ("btrfs", "reading paddr 0x%" PRIxGRUB_UINT64_T "\n",
+                             paddr);
 
                dev = find_device (data, stripe->device_id);
                if (!dev)