Changeset 1a9174e in mainline for uspace/srv/volsrv/volsrv.c

Timestamp:

2018-06-29T15:35:50Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d3b2ffa

Parents:

72c72d4

git-author:

Jiri Svoboda <jiri@…> (2018-06-28 18:34:52)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-29 15:35:50)

Message:

Volume server needs to react to partitions being removed.

File:

• uspace/srv/volsrv/volsrv.c (modified) (11 diffs)

uspace/srv/volsrv/volsrv.c

@@ -144 +144 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_info_srv(%zu)",
             sid);
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall_handle, ENOENT);
@@ -153 +153 @@
         if (rc != EOK) {
                 async_answer_0(icall_handle, EIO);
-                return;
+                goto error;
         }
 
@@ -161 +161 @@
                 async_answer_0(chandle, EREFUSED);
                 async_answer_0(icall_handle, EREFUSED);
-                return;
+                goto error;
         }
 
@@ -167 +167 @@
                 async_answer_0(chandle, EINVAL);
                 async_answer_0(icall_handle, EINVAL);
-                return;
+                goto error;
         }
 
@@ -175 +175 @@
                 async_answer_0(chandle, rc);
                 async_answer_0(icall_handle, rc);
-                return;
-        }
-
-        async_answer_0(icall_handle, EOK);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
 }
 
@@ -190 +192 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu)", sid);
 
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall_handle, ENOENT);
-                return;
+                goto error;
         }
 
@@ -199 +201 @@
         if (rc != EOK) {
                 async_answer_0(icall_handle, EIO);
-                return;
-        }
-
-        async_answer_0(icall_handle, EOK);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
 }
 
@@ -214 +218 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_srv(%zu)", sid);
 
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall_handle, ENOENT);
@@ -223 +227 @@
         if (rc != EOK) {
                 async_answer_0(icall_handle, EIO);
-                return;
-        }
-
-        async_answer_0(icall_handle, EOK);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
 }
 
@@ -292 +298 @@
         }
 
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 free(label);
@@ -303 +309 @@
                 free(label);
                 async_answer_0(icall_handle, rc);
+                vol_part_del_ref(part);
                 return;
         }