Changeset ff381a7 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-11-02T20:54:19Z (8 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/lib/fdisk/src/fdisk.c (modified) (2 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -228 +228 @@
 
         if (!info->blk_inited) {
-                rc = block_init(EXCHANGE_SERIALIZE, info->svcid, 2048);
+                rc = block_init(info->svcid, 2048);
                 if (rc != EOK)
                         return rc;
@@ -559 +559 @@
         int rc;
 
-        rc = block_init(EXCHANGE_SERIALIZE, dev->sid, 2048);
+        rc = block_init(dev->sid, 2048);
         if (rc != EOK)
                 return rc;