fs: convert error and debug messages to log
Use log functions for error and debug messages of the file-system.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 8b19811..bfc35c9 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -5,6 +5,8 @@
* Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
*/
+#define LOG_CATEGORY LOGC_CORE
+
#include <common.h>
#include <blk.h>
#include <compiler.h>
@@ -19,7 +21,7 @@
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;
@@ -27,8 +29,8 @@
/* Check partition boundaries */
if ((sector + ((byte_offset + byte_len - 1) >> log2blksz))
>= partition->size) {
- printf("%s read outside partition " LBAFU "\n", __func__,
- sector);
+ log_err("%s read outside partition " LBAFU "\n", __func__,
+ sector);
return 0;
}
@@ -36,14 +38,14 @@
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,
@@ -73,7 +75,7 @@
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);
@@ -85,7 +87,7 @@
/* 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);