Changeset 3c518fc in mainline

Timestamp:

2025-06-17T22:31:01Z (4 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f0360ec

Parents:

137f7cf5

Message:

hr: remove HR_BD_SYNC

All syncs are now done with common util hr_sync_extents().

Location:

uspace/srv/bd/hr

Files:

• raid0.c (modified) (3 diffs)
• raid1.c (modified) (1 diff)
• var.h (modified) (1 diff)

uspace/srv/bd/hr/raid0.c

@@ -253 +253 @@
         uint8_t *data_read = dst;
 
+        if (size < cnt * vol->bsize)
+                return EINVAL;
+
         fibril_rwlock_read_lock(&vol->states_lock);
         if (vol->state != HR_VOL_ONLINE) {
@@ -259 +262 @@
         }
         fibril_rwlock_read_unlock(&vol->states_lock);
-
-        /* propagate sync */
-        if (type == HR_BD_SYNC && ba == 0 && cnt == 0) {
-                hr_fgroup_t *group = hr_fgroup_create(vol->fge,
-                    vol->extent_no);
-                if (group == NULL)
-                        return ENOMEM;
-
-                for (size_t i = 0; i < vol->extent_no; i++) {
-                        hr_io_t *io = hr_fgroup_alloc(group);
-                        io->extent = i;
-                        io->ba = ba;
-                        io->cnt = cnt;
-                        io->type = type;
-                        io->vol = vol;
-
-                        hr_fgroup_submit(group, hr_io_worker, io);
-                }
-
-                size_t bad;
-                rc = hr_fgroup_wait(group, NULL, &bad);
-                if (rc == ENOMEM)
-                        return ENOMEM;
-
-                if (bad > 0)
-                        return EIO;
-
-                return EOK;
-        }
-
-        if (type == HR_BD_READ || type == HR_BD_WRITE)
-                if (size < cnt * vol->bsize)
-                        return EINVAL;
 
         rc = hr_check_ba_range(vol, cnt, ba);
@@ -334 +304 @@
                         break;
 
-                if (type == HR_BD_READ)
-                        data_read += len;
-                else if (type == HR_BD_WRITE)
-                        data_write += len;
+                data_read += len;
+                data_write += len;
 
                 strip_off = 0;

uspace/srv/bd/hr/raid1.c

@@ -347 +347 @@
                 return rc;
 
-        /* allow full dev sync */
-        if (!(type == HR_BD_SYNC && ba == 0 && cnt == 0))
-                hr_add_data_offset(vol, &ba);
+        hr_add_data_offset(vol, &ba);
 
         /*

uspace/srv/bd/hr/var.h

@@ -114 +114 @@
 
 typedef enum {
-        HR_BD_SYNC,
         HR_BD_READ,
         HR_BD_WRITE