Changes in / [e27b89a:0712ff2] in mainline

Files:

• contrib/bp/srv/fs/fat/fat.bp (added)
• contrib/bp/srv/pci/pci.bp (added)
• kernel/arch/arm32/include/elf.h (modified) (2 diffs)
• kernel/arch/mips32/include/mm/tlb.h (modified) (4 diffs)
• uspace/lib/libblock/libblock.c (modified) (4 diffs)

kernel/arch/arm32/include/elf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32   
+/** @addtogroup arm32
  * @{
  */
@@ -37 +37 @@
 #define KERN_arm32_ELF_H_
 
-#define ELF_MACHINE             EM_ARM
+#define ELF_MACHINE  EM_ARM
 
-#ifdef BIG_ENDIAN
-#define ELF_DATA_ENCODING       ELFDATA2MSB
+#ifdef __BE__
+        #define ELF_DATA_ENCODING  ELFDATA2MSB
 #else
-#define ELF_DATA_ENCODING       ELFDATA2LSB
+        #define ELF_DATA_ENCODING  ELFDATA2LSB
 #endif
 
-#define ELF_CLASS               ELFCLASS32
+#define ELF_CLASS  ELFCLASS32
 
 #endif

kernel/arch/mips32/include/mm/tlb.h

@@ -59 +59 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned : 2;       /* zero */
                 unsigned pfn : 24;  /* frame number */
@@ -80 +80 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned vpn2 : 19;
                 unsigned : 5;
@@ -95 +95 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned : 7;
                 unsigned mask : 12;
@@ -110 +110 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned p : 1;
                 unsigned : 27;

uspace/lib/libblock/libblock.c

@@ -345 +345 @@
         link_t *l;
         unsigned long key = boff;
-        int rc = EOK;
+        int rc;
         
         devcon = devcon_search(dev_handle);
@@ -355 +355 @@
 
 retry:
+        rc = EOK;
+        b = NULL;
+
         fibril_mutex_lock(&cache->lock);
         l = hash_table_find(&cache->block_hash, &key);
@@ -394 +397 @@
                         unsigned long temp_key;
 recycle:
-                        assert(!list_empty(&cache->free_head));
+                        if (list_empty(&cache->free_head)) {
+                                fibril_mutex_unlock(&cache->lock);
+                                rc = ENOMEM;
+                                goto out;
+                        }
                         l = cache->free_head.next;
                         b = list_get_instance(l, block_t, free_link);
@@ -477 +484 @@
 
                 fibril_mutex_unlock(&b->lock);
+        }
+out:
+        if ((rc != EOK) && b) {
+                assert(b->toxic);
+                (void) block_put(b);
+                b = NULL;
         }
         *block = b;