Changeset 0773396 in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.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/srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -259 +259 @@
         tmpfs_node_t *parentp = TMPFS_NODE(pfn);
 
-        list_foreach(parentp->cs_list, lnk) {
-                tmpfs_dentry_t *dentryp;
-                dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
+        list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dentryp) {
                 if (!str_cmp(dentryp->name, component)) {
                         *rfn = FS_NODE(dentryp->node);
@@ -365 +363 @@
 
         /* Check for duplicit entries. */
-        list_foreach(parentp->cs_list, lnk) {
-                dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); 
-                if (!str_cmp(dentryp->name, nm))
+        list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dp) {
+                if (!str_cmp(dp->name, nm))
                         return EEXIST;
         }
@@ -400 +397 @@
         if (!parentp)
                 return EBUSY;
-        
-        list_foreach(parentp->cs_list, lnk) {
-                dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
-                if (!str_cmp(dentryp->name, nm)) {
+
+        list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dp) {
+                if (!str_cmp(dp->name, nm)) {
+                        dentryp = dp;
                         childp = dentryp->node;
                         assert(FS_NODE(childp) == cfn);