Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset eb40d86 in mainline


Ignore:
Timestamp:
2013-09-13T15:57:46Z (7 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
master
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:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/debug/panic.c

    r1eaa3cf reb40d86  
    9696        printf("THE=%p: ", THE);
    9797        if (THE != NULL) {
    98                 printf("pe=%" PRIun " thr=%p task=%p cpu=%p as=%p"
     98                printf("pd=%" PRIun " thread=%p task=%p cpu=%p as=%p"
    9999                    " magic=%#" PRIx32 "\n", THE->preemption_disabled,
    100100                    THE->thread, THE->task, THE->cpu, THE->as, THE->magic);
     101               
     102                if (THE->thread != NULL)
     103                        printf("thread=\"%s\"\n", THE->thread->name);
     104               
     105                if (THE->task != NULL)
     106                        printf("task=\"%s\"\n", THE->task->name);
    101107        } else
    102108                printf("invalid\n");
  • uspace/srv/fs/ext4fs/ext4fs_ops.c

    r1eaa3cf reb40d86  
    876876        if (rc != EOK)
    877877                return rc;
    878         if (NULL == inst)
    879                 return ENOENT;
    880878
    881879        ext4_superblock_t *sb = inst->filesystem->superblock;
  • uspace/srv/fs/mfs/mfs_ops.c

    r1eaa3cf reb40d86  
    12011201        *count = sbi->nfree_zones;
    12021202
    1203         return EOK;
     1203        return rc;
    12041204}
    12051205
Note: See TracChangeset for help on using the changeset viewer.