Changeset 5d96f427 in mainline for uspace/srv/bd/hr/superblock.c

Timestamp:

2024-11-15T16:44:25Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

733564a

Parents:

bd51105

git-author:

Miroslav Cimerman <mc@…> (2024-11-15 16:08:11)

git-committer:

Miroslav Cimerman <mc@…> (2024-11-15 16:44:25)

Message:

hr: use DPRINTF and ERR_PRINTF macros from util.h

File:

• uspace/srv/bd/hr/superblock.c (modified) (6 diffs)

uspace/srv/bd/hr/superblock.c

@@ -54 +54 @@
 errno_t hr_write_meta_to_vol(hr_volume_t *vol)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_write_meta_to_vol()");
+        DPRINTF("hr_write_meta_to_vol()\n");
 
         errno_t rc;
@@ -71 +71 @@
 
         if (vol->nblocks < meta_blkno) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "not enough blocks to write metadata");
+                ERR_PRINTF("not enough blocks to write metadat\n");
                 rc = EINVAL;
                 goto error;
         } else if (vol->nblocks == meta_blkno) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "there would be zero data blocks after writing metadata, aborting");
+                ERR_PRINTF("there would be zero data blocks after writing "
+                    "metadata, aborting");
                 rc = EINVAL;
                 goto error;
@@ -115 +114 @@
 {
         if (uint64_t_le2host(md->magic) != HR_MAGIC) {
-                printf("invalid magic\n");
+                ERR_PRINTF("invalid magic\n");
                 return EINVAL;
         }
@@ -123 +122 @@
 errno_t hr_fill_vol_from_meta(hr_volume_t *vol)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_get_vol_from_meta()");
+        DPRINTF("hr_get_vol_from_meta()\n");
 
         errno_t rc;
@@ -171 +170 @@
 
         if (vol->dev_no != uint32_t_le2host(metadata->extent_no)) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "number of divices in array differ: specified %zu, metadata states %u",
+                ERR_PRINTF("number of divices in array differ: specified %zu, "
+                    "metadata states %u",
                     vol->dev_no, uint32_t_le2host(metadata->extent_no));
                 rc = EINVAL;
@@ -185 +184 @@
 
         if (str_cmp(metadata->devname, vol->devname) != 0) {
-                log_msg(LOG_DEFAULT, LVL_NOTE,
-                    "devname on metadata (%s) and config (%s) differ, using config",
-                    metadata->devname, vol->devname);
+                log_msg(LOG_DEFAULT, LVL_WARN,
+                    "devname on metadata (%s) and config (%s) differ, "
+                    "using config", metadata->devname, vol->devname);
         }
 end: