Changeset 81b4c795 in mainline

Timestamp:

2025-06-21T17:25:23Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

263a2389

Parents:

cff2342

Message:

hr: rename malloc_waitok() to hr_malloc_waitok()

Location:

uspace/srv/bd/hr

Files:

• fge.c (modified) (3 diffs)
• io.c (modified) (2 diffs)
• raid5.c (modified) (2 diffs)
• util.c (modified) (3 diffs)
• util.h (modified) (1 diff)

uspace/srv/bd/hr/fge.c

@@ -140 +140 @@
         assert(wu_cnt > 0);
 
-        hr_fgroup_t *result = malloc_waitok(sizeof(hr_fgroup_t));
+        hr_fgroup_t *result = hr_malloc_waitok(sizeof(hr_fgroup_t));
 
         result->reserved_cnt = 0;
@@ -161 +161 @@
                  */
                 size_t taking = parent->wu_storage_free_count;
-                result->own_mem = malloc_waitok(parent->wu_size * (wu_cnt - taking));
+                result->own_mem =
+                    hr_malloc_waitok(parent->wu_size * (wu_cnt - taking));
                 result->reserved_cnt = taking;
                 parent->wu_storage_free_count = 0;
@@ -168 +169 @@
         if (result->reserved_cnt > 0) {
                 result->memslots =
-                    malloc_waitok(sizeof(size_t) * result->reserved_cnt);
+                    hr_malloc_waitok(sizeof(size_t) * result->reserved_cnt);
         }
 

uspace/srv/bd/hr/io.c

@@ -234 +234 @@
         hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
 
-        uint8_t *data = malloc_waitok(io->cnt * io->vol->bsize);
+        uint8_t *data = hr_malloc_waitok(io->cnt * io->vol->bsize);
 
         rc = hr_read_direct(extents[ext_idx].svc_id, io->ba, io->cnt, data);
@@ -280 +280 @@
         hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
 
-        uint8_t *data = malloc_waitok(io->cnt * io->vol->bsize);
+        uint8_t *data = hr_malloc_waitok(io->cnt * io->vol->bsize);
 
         rc = hr_write_direct(extents[ext_idx].svc_id, io->ba, io->cnt, data);

uspace/srv/bd/hr/raid5.c

@@ -260 +260 @@
          * path.
          */
-        hr_range_lock_t **rlps = malloc_waitok(stripes_cnt * sizeof(*rlps));
+        hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
         for (size_t i = 0; i < stripes_cnt; i++)
-                rlps[i] = malloc_waitok(sizeof(**rlps));
+                rlps[i] = hr_malloc_waitok(sizeof(**rlps));
 
         /*
@@ -474 +474 @@
          * path.
          */
-        hr_range_lock_t **rlps = malloc_waitok(stripes_cnt * sizeof(*rlps));
+        hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
         for (size_t i = 0; i < stripes_cnt; i++)
-                rlps[i] = malloc_waitok(sizeof(**rlps));
+                rlps[i] = hr_malloc_waitok(sizeof(**rlps));
 
         /*

uspace/srv/bd/hr/util.c

@@ -84 +84 @@
  * Return value is never NULL.
  */
-void *malloc_waitok(size_t size)
+void *hr_malloc_waitok(size_t size)
 {
         void *ret;
@@ -93 +93 @@
 }
 
-void *calloc_waitok(size_t nmemb, size_t size)
+void *hr_calloc_waitok(size_t nmemb, size_t size)
 {
         void *ret;
@@ -524 +524 @@
     uint64_t cnt)
 {
-        hr_range_lock_t *rl = malloc_waitok(sizeof(hr_range_lock_t));
+        hr_range_lock_t *rl = hr_malloc_waitok(sizeof(hr_range_lock_t));
 
         return hr_range_lock_acquire_internal(rl, vol, ba, cnt);

uspace/srv/bd/hr/util.h

@@ -77 +77 @@
 } hr_range_lock_t;
 
-extern void *malloc_waitok(size_t)
+extern void *hr_malloc_waitok(size_t)
     __attribute__((malloc));
 
-extern void *calloc_waitok(size_t, size_t)
+extern void *hr_calloc_waitok(size_t, size_t)
     __attribute__((malloc));