Changeset eb40d86 in mainline

Timestamp:

2013-09-13T15:57:46Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

fd7dbbb

Parents:

1eaa3cf (diff), cc8044e (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

Files:

• kernel/generic/src/debug/panic.c (modified) (1 diff)
• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (1 diff)

kernel/generic/src/debug/panic.c

@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pe=%" PRIun " thr=%p task=%p cpu=%p as=%p"
+                printf("pd=%" PRIun " thread=%p task=%p cpu=%p as=%p"
                     " magic=%#" PRIx32 "\n", THE->preemption_disabled,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);
+                
+                if (THE->thread != NULL)
+                        printf("thread=\"%s\"\n", THE->thread->name);
+                
+                if (THE->task != NULL)
+                        printf("task=\"%s\"\n", THE->task->name);
         } else
                 printf("invalid\n");

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -876 +876 @@
         if (rc != EOK)
                 return rc;
-        if (NULL == inst)
-                return ENOENT;
 
         ext4_superblock_t *sb = inst->filesystem->superblock;

uspace/srv/fs/mfs/mfs_ops.c

@@ -1201 +1201 @@
         *count = sbi->nfree_zones;
 
-        return EOK;
+        return rc;
 }