Changeset ff381a7 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/bd/vbd/disk.c

@@ -360 +360 @@
         rc = vbds_disk_by_svcid(sid, &disk);
         if (rc == EOK)
-                return EEXISTS;
+                return EEXIST;
 
         disk = calloc(1, sizeof(vbds_disk_t));
@@ -374 +374 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_init(%zu)", sid);
-        rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
+        rc = block_init(sid, 2048);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
@@ -872 +872 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_conn()");
 
-        svcid = IPC_GET_ARG1(*icall);
+        svcid = IPC_GET_ARG2(*icall);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_conn() - svcid=%zu", svcid);