Changeset 0773396 in mainline for uspace/lib/block/block.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/block/block.c (modified) (3 diffs)

uspace/lib/block/block.c

@@ -37 +37 @@
  */
 
-#include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
 #include <ipc/services.h>
@@ -93 +92 @@
         fibril_mutex_lock(&dcl_lock);
         
-        list_foreach(dcl, cur) {
-                devcon_t *devcon = list_get_instance(cur, devcon_t, link);
+        list_foreach(dcl, link, devcon_t, devcon) {
                 if (devcon->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);
@@ -124 +122 @@
         
         fibril_mutex_lock(&dcl_lock);
-        list_foreach(dcl, cur) {
-                devcon_t *d = list_get_instance(cur, devcon_t, link);
+        list_foreach(dcl, link, devcon_t, d) {
                 if (d->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);