Changeset ff381a7 in mainline for uspace/lib/mbr/libmbr.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/mbr/libmbr.c (modified) (5 diffs)

uspace/lib/mbr/libmbr.c

@@ -109 +109 @@
         }
         
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -133 +133 @@
 int mbr_write_mbr(mbr_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;
@@ -227 +227 @@
                 label->mbr = mbr_alloc_mbr();
         
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -413 +413 @@
 mbr_err_val mbr_add_partition(mbr_label_t *label, mbr_part_t *part)
 {
-        int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+        int rc = block_init(label->device, 512);
         if ((rc != EOK) && (rc != EEXIST))
                 return ERR_LIBBLOCK;
@@ -622 +622 @@
         uint32_t addr = base;
         
-        int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+        int rc = block_init(label->device, 512);
         if (rc != EOK)
                 goto end;