Changes in uspace/srv/volsrv/part.c [4285f384:ca127f37] in mainline

File:

• uspace/srv/volsrv/part.c (modified) (5 diffs)

uspace/srv/volsrv/part.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <adt/list.h>
-#include <bd.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -643 +642 @@
 }
 
-static errno_t vol_part_eject_device(service_id_t svcid)
-{
-        async_sess_t *sess;
-        errno_t rc;
-        bd_t *bd;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_device(%zu)",
-            (size_t)svcid);
-
-        sess = loc_service_connect(svcid, INTERFACE_BLOCK, 0);
-        if (sess == NULL)
-                return EIO;
-
-        rc = bd_open(sess, &bd);
-        if (rc != EOK) {
-                async_hangup(sess);
-                return EIO;
-        }
-
-        rc = bd_eject(bd);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_WARN, "vol_part_eject_device(): "
-                    "eject fail");
-                bd_close(bd);
-                async_hangup(sess);
-                return EIO;
-        }
-
-        bd_close(bd);
-        async_hangup(sess);
-        return EOK;
-}
-
-errno_t vol_part_eject_part(vol_part_t *part, vol_eject_flags_t flags)
+errno_t vol_part_eject_part(vol_part_t *part)
 {
         int rc;
@@ -701 +667 @@
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Failed deleting "
                             "mount directory %s.", part->cur_mp);
-                }
-        }
-
-        if ((flags & vef_physical) != 0) {
-                rc = vol_part_eject_device(part->svc_id);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed physically "
-                            "ejecting device %s.", part->svc_name);
                 }
         }
@@ -861 +819 @@
 
         if (part->cur_mp != NULL) {
-                rc = vol_part_eject_part(part, vef_none);
+                rc = vol_part_eject_part(part);
                 if (rc != EOK)
                         return rc;