Changeset ff381a7 in mainline for uspace/lib/gpt/libgpt.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/lib/gpt/libgpt.c (modified) (4 diffs)

uspace/lib/gpt/libgpt.c

@@ -137 +137 @@
 int gpt_read_header(gpt_label_t *label, service_id_t dev_handle)
 {
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -191 +191 @@
 {
         /* The comm_size argument (the last one) is ignored */
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+        int rc = block_init(dev_handle, 4096);
         if ((rc != EOK) && (rc != EEXIST))
                 return rc;
@@ -288 +288 @@
         }
         
-        int rc = block_init(EXCHANGE_SERIALIZE, label->device,
-            sizeof(gpt_entry_t));
+        int rc = block_init(label->device, sizeof(gpt_entry_t));
         if (rc != EOK) {
                 gpt_free_partitions(label->parts);
@@ -348 +347 @@
 {
         /* comm_size of 4096 is ignored */
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+        int rc = block_init(dev_handle, 4096);
         if ((rc != EOK) && (rc != EEXIST))
                 return rc;