Changeset 6843a9c in mainline for uspace/srv/bd/part/guid_part/guid_part.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/bd/part/guid_part/guid_part.c (modified) (2 diffs)

uspace/srv/bd/part/guid_part/guid_part.c

@@ -164 +164 @@
 
         /* Register server with location service. */
-        rc = loc_server_register(NAME, gpt_connection);
+        async_set_client_connection(gpt_connection);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf(NAME ": Unable to register server.\n");
                 return rc;
         }
-
+        
         /*
          * Create partition devices.
@@ -348 +349 @@
         }
 
-        fs_va = as_get_mappable_page(comm_size);
-        if (fs_va == NULL) {
+        (void) async_share_out_finalize(callid, &fs_va);
+        if (fs_va == AS_MAP_FAILED) {
                 async_answer_0(callid, EHANGUP);
                 return;
         }
-
-        (void) async_share_out_finalize(callid, fs_va);
 
         while (true) {