Changes in uspace/srv/bd/vbd/disk.c [4285f384:fafb8e5] in mainline

File:

• uspace/srv/bd/vbd/disk.c (modified) (12 diffs)

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2016 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
 
 #include <adt/list.h>
-#include <bd.h>
 #include <bd_srv.h>
 #include <block.h>
@@ -52 +51 @@
 #include "types/vbd.h"
 
-loc_srv_t *vbds_srv;
-
 static fibril_mutex_t vbds_disks_lock;
 static list_t vbds_disks; /* of vbds_disk_t */
@@ -72 +69 @@
 static errno_t vbds_bd_get_block_size(bd_srv_t *, size_t *);
 static errno_t vbds_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
-static errno_t vbds_bd_eject(bd_srv_t *);
 
 static errno_t vbds_bsa_translate(vbds_part_t *, aoff64_t, size_t, aoff64_t *);
@@ -95 +91 @@
         .write_blocks = vbds_bd_write_blocks,
         .get_block_size = vbds_bd_get_block_size,
-        .get_num_blocks = vbds_bd_get_num_blocks,
-        .eject = vbds_bd_eject
+        .get_num_blocks = vbds_bd_get_num_blocks
 };
 
@@ -502 +497 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_init(%zu)", sid);
-        rc = block_init(sid);
+        rc = block_init(sid, 2048);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
@@ -584 +579 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_fini(%zu)", sid);
         block_fini(sid);
-        free(disk->svc_name);
         free(disk);
         return EOK;
@@ -1075 +1069 @@
 }
 
-static errno_t vbds_bd_eject(bd_srv_t *bd)
-{
-        vbds_part_t *part = bd_srv_part(bd);
-        async_sess_t *sess;
-        bd_t *bdc;
-        errno_t rc;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_eject()");
-
-        fibril_rwlock_read_lock(&part->lock);
-
-        sess = loc_service_connect(part->disk->svc_id, INTERFACE_BLOCK, 0);
-        if (sess == NULL) {
-                log_msg(LOG_DEFAULT, LVL_WARN,
-                    "vbds_bd_eject() - failed connect");
-                fibril_rwlock_read_unlock(&part->lock);
-                return EIO;
-        }
-
-        rc = bd_open(sess, &bdc);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_WARN,
-                    "vbds_bd_eject() - failed open");
-                async_hangup(sess);
-                fibril_rwlock_read_unlock(&part->lock);
-                return EIO;
-        }
-
-        rc = bd_eject(bdc);
-
-        bd_close(bdc);
-        async_hangup(sess);
-
-        fibril_rwlock_read_unlock(&part->lock);
-        return rc;
-}
-
 void vbds_bd_conn(ipc_call_t *icall, void *arg)
 {
@@ -1165 +1122 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loc_service_register('%s')",
             name);
-        rc = loc_service_register(vbds_srv, name, &psid);
+        rc = loc_service_register(name, &psid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
@@ -1174 +1131 @@
         }
 
-        rc = loc_service_add_to_cat(vbds_srv, psid, part_cid);
+        rc = loc_service_add_to_cat(psid, part_cid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failled adding partition "
@@ -1181 +1138 @@
                 free(part);
 
-                rc = loc_service_unregister(vbds_srv, psid);
+                rc = loc_service_unregister(psid);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error unregistering "
@@ -1203 +1160 @@
             "disk->svc_name='%s', id=%zu)", part->disk->svc_name, part->svc_id);
 
-        rc = loc_service_unregister(vbds_srv, part->svc_id);
+        rc = loc_service_unregister(part->svc_id);
         if (rc != EOK)
                 return EIO;