Changeset b235c67 in mainline

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

64eba57

Parents:

733564a

git-author:

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

git-committer:

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

Message:

hr: use shorthand vol for volume

File:

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

uspace/srv/bd/hr/hr.c

@@ -65 +65 @@
 
         fibril_mutex_lock(&hr_volumes_lock);
-        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
-                if (volume->svc_id == svc_id) {
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, vol) {
+                if (vol->svc_id == svc_id) {
                         fibril_mutex_unlock(&hr_volumes_lock);
-                        return volume;
+                        return vol;
                 }
         }
@@ -81 +81 @@
 
         fibril_mutex_lock(&hr_volumes_lock);
-        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
-                if (volume->svc_id == svc_id) {
-                        hr_fini_devs(volume);
-                        list_remove(&volume->lvolumes);
-                        free(volume);
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, vol) {
+                if (vol->svc_id == svc_id) {
+                        hr_fini_devs(vol);
+                        list_remove(&vol->lvolumes);
+                        free(vol);
                         fibril_mutex_unlock(&hr_volumes_lock);
                         return EOK;
@@ -310 +310 @@
                 goto error;
 
-        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
-                memcpy(info.extents, volume->extents,
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, vol) {
+                memcpy(info.extents, vol->extents,
                     sizeof(hr_extent_t) * HR_MAXDEVS);
-                info.svc_id = volume->svc_id;
-                info.extent_no = volume->dev_no;
-                info.level = volume->level;
+                info.svc_id = vol->svc_id;
+                info.extent_no = vol->dev_no;
+                info.level = vol->level;
                 /* print usable number of blocks */
-                info.nblocks = volume->data_blkno;
-                info.strip_size = volume->strip_size;
-                info.bsize = volume->bsize;
-                info.status = volume->status;
+                info.nblocks = vol->data_blkno;
+                info.strip_size = vol->strip_size;
+                info.bsize = vol->bsize;
+                info.status = vol->status;
 
                 if (!async_data_read_receive(&call, &size)) {