Merge tag 'doc-2023-10-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

[thirdparty/u-boot.git] / fs / fs_internal.c

diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 58b441030c863dda0ce0ea202b949735e088d024..111f91b355d1ff974d0953944464fc07c48bbe62 100644 (file)
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -1,32 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * 2017 by Marek Behun <marek.behun@nic.cz>
+ * 2017 by Marek Behún <kabel@kernel.org>
  *
  * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
+#define LOG_CATEGORY LOGC_CORE
+
 #include <common.h>
+#include <blk.h>
 #include <compiler.h>
+#include <log.h>
 #include <part.h>
 #include <memalign.h>
 
-int fs_devread(struct blk_desc *blk, disk_partition_t *partition,
+int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
               lbaint_t sector, int byte_offset, int byte_len, char *buf)
 {
        unsigned block_len;
-       int log2blksz = blk->log2blksz;
+       int log2blksz;
        ALLOC_CACHE_ALIGN_BUFFER(char, sec_buf, (blk ? blk->blksz : 0));
        if (blk == NULL) {
-               printf("** Invalid Block Device Descriptor (NULL)\n");
+               log_err("** Invalid Block Device Descriptor (NULL)\n");
                return 0;
        }
+       log2blksz = blk->log2blksz;
 
        /* Check partition boundaries */
        if ((sector + ((byte_offset + byte_len - 1) >> log2blksz))
            >= partition->size) {
-               printf("%s read outside partition " LBAFU "\n", __func__,
-                      sector);
+               log_debug("read outside partition " LBAFU "\n", sector);
                return 0;
        }
 
@@ -34,14 +37,14 @@ int fs_devread(struct blk_desc *blk, disk_partition_t *partition,
        sector += byte_offset >> log2blksz;
        byte_offset &= blk->blksz - 1;
 
-       debug(" <" LBAFU ", %d, %d>\n", sector, byte_offset, byte_len);
+       log_debug(" <" LBAFU ", %d, %d>\n", sector, byte_offset, byte_len);
 
        if (byte_offset != 0) {
                int readlen;
                /* read first part which isn't aligned with start of sector */
                if (blk_dread(blk, partition->start + sector, 1,
                              (void *)sec_buf) != 1) {
-                       printf(" ** %s read error **\n", __func__);
+                       log_err(" ** %s read error **\n", __func__);
                        return 0;
                }
                readlen = min((int)blk->blksz - byte_offset,
@@ -71,7 +74,7 @@ int fs_devread(struct blk_desc *blk, disk_partition_t *partition,
        if (blk_dread(blk, partition->start + sector,
                      block_len >> log2blksz, (void *)buf) !=
                        block_len >> log2blksz) {
-               printf(" ** %s read error - block\n", __func__);
+               log_err(" ** %s read error - block\n", __func__);
                return 0;
        }
        block_len = byte_len & ~(blk->blksz - 1);
@@ -83,7 +86,7 @@ int fs_devread(struct blk_desc *blk, disk_partition_t *partition,
                /* read rest of data which are not in whole sector */
                if (blk_dread(blk, partition->start + sector, 1,
                              (void *)sec_buf) != 1) {
-                       printf("* %s read error - last part\n", __func__);
+                       log_err("* %s read error - last part\n", __func__);
                        return 0;
                }
                memcpy(buf, sec_buf, byte_len);