Changeset feeac0d in mainline for uspace/srv/fs

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

uspace/srv/fs

Files:

• cdfs/cdfs_ops.c (modified) (2 diffs)
• exfat/exfat_idx.c (modified) (1 diff)
• exfat/exfat_ops.c (modified) (2 diffs)
• ext4fs/ext4fs_ops.c (modified) (1 diff)
• fat/fat_idx.c (modified) (1 diff)
• fat/fat_ops.c (modified) (2 diffs)
• tmpfs/tmpfs_ops.c (modified) (3 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -365 +365 @@
         
         /* Check for duplicate entries */
-        list_foreach(parent->cs_list, link) {
-                cdfs_dentry_t *dentry =
-                    list_get_instance(link, cdfs_dentry_t, link);
-                
+        list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) {
                 if (str_cmp(dentry->name, name) == 0)
                         return EEXIST;
@@ -524 +521 @@
         }
         
-        list_foreach(parent->cs_list, link) {
-                cdfs_dentry_t *dentry =
-                    list_get_instance(link, cdfs_dentry_t, link);
-                
+        list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) {
                 if (str_cmp(dentry->name, component) == 0) {
                         *fn = get_cached_node(parent->service_id, dentry->index);

uspace/srv/fs/exfat/exfat_idx.c

@@ -88 +88 @@
 static unused_t *unused_find(service_id_t service_id, bool lock)
 {
-        unused_t *u;
-
         if (lock)
                 fibril_mutex_lock(&unused_lock);
 
-        list_foreach(unused_list, l) {
-                u = list_get_instance(l, unused_t, link);
+        list_foreach(unused_list, link, unused_t, u) {
                 if (u->service_id == service_id) 
                         return u;

uspace/srv/fs/exfat/exfat_ops.c

@@ -155 +155 @@
 static int exfat_node_fini_by_service_id(service_id_t service_id)
 {
-        exfat_node_t *nodep;
         int rc;
 
@@ -166 +165 @@
 restart:
         fibril_mutex_lock(&ffn_mutex);
-        list_foreach(ffn_list, lnk) {
-                nodep = list_get_instance(lnk, exfat_node_t, ffn_link);
+        list_foreach(ffn_list, ffn_link, exfat_node_t, nodep) {
                 if (!fibril_mutex_trylock(&nodep->lock)) {
                         fibril_mutex_unlock(&ffn_mutex);

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -194 +194 @@
         }
         
-        list_foreach(instance_list, link) {
-                ext4fs_instance_t *tmp =
-                    list_get_instance(link, ext4fs_instance_t, link);
-                
+        list_foreach(instance_list, link, ext4fs_instance_t, tmp) {
                 if (tmp->service_id == service_id) {
                         *inst = tmp;

uspace/srv/fs/fat/fat_idx.c

@@ -88 +88 @@
 static unused_t *unused_find(service_id_t service_id, bool lock)
 {
-        unused_t *u;
-
         if (lock)
                 fibril_mutex_lock(&unused_lock);
 
-        list_foreach(unused_list, l) {
-                u = list_get_instance(l, unused_t, link);
+        list_foreach(unused_list, link, unused_t, u) {
                 if (u->service_id == service_id) 
                         return u;

uspace/srv/fs/fat/fat_ops.c

@@ -149 +149 @@
 static int fat_node_fini_by_service_id(service_id_t service_id)
 {
-        fat_node_t *nodep;
         int rc;
 
@@ -160 +159 @@
 restart:
         fibril_mutex_lock(&ffn_mutex);
-        list_foreach(ffn_list, lnk) {
-                nodep = list_get_instance(lnk, fat_node_t, ffn_link);
+        list_foreach(ffn_list, ffn_link, fat_node_t, nodep) {
                 if (!fibril_mutex_trylock(&nodep->lock)) {
                         fibril_mutex_unlock(&ffn_mutex);

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);