Changeset bf0a791 in mainline

Timestamp:

2024-11-27T11:19:10Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8160e4c0

Parents:

aa7864b

Message:

hr: cstyle

Location:

uspace

Files:

• app/hrctl/hrctl.c (modified) (1 diff)
• srv/bd/hr/hr.c (modified) (1 diff)
• srv/bd/hr/raid0.c (modified) (2 diffs)
• srv/bd/hr/raid1.c (modified) (3 diffs)
• srv/bd/hr/raid4.c (modified) (6 diffs)
• srv/bd/hr/raid5.c (modified) (6 diffs)
• srv/bd/hr/superblock.c (modified) (1 diff)

uspace/app/hrctl/hrctl.c

@@ -341 +341 @@
                 case 'n':
                         cfg->dev_no = strtol(optarg, NULL, 10);
-                        if ((int) cfg->dev_no + optind != argc)
+                        if ((int)cfg->dev_no + optind != argc)
                                 goto bad;
                         rc = fill_config_devs(argc, argv, optind, cfg);

uspace/srv/bd/hr/hr.c

@@ -264 +264 @@
 
         svc_id = ipc_get_arg1(icall);
-        fail_extent = (long) ipc_get_arg2(icall);
+        fail_extent = (long)ipc_get_arg2(icall);
 
         vol = hr_get_volume(svc_id);

uspace/srv/bd/hr/raid0.c

@@ -128 +128 @@
 {
         fibril_mutex_lock(&vol->lock);
-        (void) hr_raid0_update_vol_status(vol);
+        (void)hr_raid0_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
 }
@@ -291 +291 @@
 
 error:
-        (void) hr_raid0_update_vol_status(vol);
+        (void)hr_raid0_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
         return rc;

uspace/srv/bd/hr/raid1.c

@@ -129 +129 @@
 {
         fibril_mutex_lock(&vol->lock);
-        (void) hr_raid1_update_vol_status(vol);
+        (void)hr_raid1_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
 }
@@ -359 +359 @@
                 rc = EIO;
 
-        (void) hr_raid1_update_vol_status(vol);
+        (void)hr_raid1_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
         return rc;
@@ -486 +486 @@
         hr_write_meta_to_ext(vol, bad);
 end:
-        (void) hr_raid1_update_vol_status(vol);
+        (void)hr_raid1_update_vol_status(vol);
 
         fibril_mutex_unlock(&vol->lock);

uspace/srv/bd/hr/raid4.c

@@ -143 +143 @@
 {
         fibril_mutex_lock(&vol->lock);
-        (void) hr_raid4_update_vol_status(vol);
+        (void)hr_raid4_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
 }
@@ -387 +387 @@
         }
 
-        if (extent == (size_t) bad) {
+        if (extent == (size_t)bad) {
                 /*
                  * new parity = read other and xor in new data
@@ -395 +395 @@
                 memset(xorbuf, 0, len);
                 for (i = 1; i < vol->dev_no; i++) {
-                        if (i == (size_t) bad) {
+                        if (i == (size_t)bad)
                                 continue;
                         } else {
@@ -545 +545 @@
                 retry_read:
                         ssize_t bad = hr_raid4_get_bad_ext(vol);
-                        if (bad > 0 && extent == (size_t) bad) {
+                        if (bad > 0 && extent == (size_t)bad) {
                                 rc = hr_raid4_read_degraded(vol, bad,
                                     phys_block, data_read, cnt);
@@ -600 +600 @@
 
 error:
-        (void) hr_raid4_update_vol_status(vol);
+        (void)hr_raid4_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
         return rc;
@@ -725 +725 @@
         hr_write_meta_to_ext(vol, bad);
 end:
-        (void) hr_raid4_update_vol_status(vol);
+        (void)hr_raid4_update_vol_status(vol);
 
         fibril_mutex_unlock(&vol->lock);

uspace/srv/bd/hr/raid5.c

@@ -140 +140 @@
 {
         fibril_mutex_lock(&vol->lock);
-        (void) hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
 }
@@ -385 +385 @@
         }
 
-        if (extent == (size_t) bad) {
+        if (extent == (size_t)bad) {
                 /*
                  * new parity = read other and xor in new data
@@ -393 +393 @@
                 memset(xorbuf, 0, len);
                 for (i = 1; i < vol->dev_no; i++) {
-                        if (i == (size_t) bad) {
+                        if (i == (size_t)bad)
                                 continue;
                         } else {
@@ -547 +547 @@
                 retry_read:
                         ssize_t bad = hr_raid5_get_bad_ext(vol);
-                        if (bad > 0 && extent == (size_t) bad) {
+                        if (bad > 0 && extent == (size_t)bad) {
                                 rc = hr_raid5_read_degraded(vol, bad,
                                     phys_block, data_read, cnt);
@@ -606 +606 @@
 
 error:
-        (void) hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
         return rc;
@@ -731 +731 @@
         hr_write_meta_to_ext(vol, bad);
 end:
-        (void) hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_status(vol);
 
         fibril_mutex_unlock(&vol->lock);

uspace/srv/bd/hr/superblock.c

@@ -212 +212 @@
         for (size_t i = 0; i < vol->dev_no; i++) {
                 for (size_t j = 0; j < vol->dev_no; j++) {
-                        if (i == (uint32_t) md_order[j]) {
+                        if (i == (uint32_t)md_order[j]) {
                                 vol->extents[i].svc_id = cfg_svc_id_order[j];
                                 vol->extents[i].status = HR_EXT_ONLINE;