Changes in uspace/lib/c/generic/loc.c [8b8c164:0239846] in mainline

File:

• uspace/lib/c/generic/loc.c (modified) (3 diffs)

uspace/lib/c/generic/loc.c

@@ -247 +247 @@
         sysarg_t retval = async_data_write_start(exch, name, str_size(name));
         
-        loc_exchange_end(exch);
-        
         if (retval != EOK) {
                 async_forget(req);
-                return retval;
-        }
-        
-        exch = loc_exchange_begin(INTERFACE_LOC_SUPPLIER);
+                loc_exchange_end(exch);
+                return retval;
+        }
+        
         async_connect_to_me(exch, 0, 0, 0);
-        loc_exchange_end(exch);
-        
+
+        /*
+         * First wait for the answer and then end the exchange. The opposite
+         * order is generally wrong because it may lead to a deadlock under
+         * certain circumstances.
+         */
         async_wait_for(req, &retval);
+        loc_exchange_end(exch);
+        
         return retval;
 }
@@ -276 +280 @@
         sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn));
         
-        
         if (retval != EOK) {
                 async_forget(req);
@@ -283 +286 @@
         }
         
+        /*
+         * First wait for the answer and then end the exchange. The opposite
+         * order is generally wrong because it may lead to a deadlock under
+         * certain circumstances.
+         */
         async_wait_for(req, &retval);
         loc_exchange_end(exch);