yaffsfs.c: Fix NULL dereference in yaffs_unmount2_reldev()

[yaffs2.git] / direct / yaffs_list.h

diff --git a/direct/yaffs_list.h b/direct/yaffs_list.h
index 624cd5f1007e345b51b93b60ab63177f2108b3c0..68d2c67ba6679b3c866ae442162b028a8769080d 100644 (file)
--- a/direct/yaffs_list.h
+++ b/direct/yaffs_list.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -24,8 +23,6 @@
 #define __YAFFS_LIST_H__
 
 
-#include "yportenv.h"
-
 /*
  * This is a simple doubly linked list implementation that matches the
  * way the Linux kernel doubly linked list implementation works.
@@ -38,6 +35,10 @@ struct list_head {
 
 
 /* Initialise a static list */
+#ifdef LIST_HEAD
+#undef LIST_HEAD
+#endif
+
 #define LIST_HEAD(name) \
 struct list_head name = { &(name), &(name)}
 
@@ -52,7 +53,7 @@ do { \
 
 
 /* Add an element to a list */
-static Y_INLINE void list_add(struct list_head *new_entry,
+static inline void list_add(struct list_head *new_entry,
                                struct list_head *list)
 {
        struct list_head *list_next = list->next;
@@ -64,7 +65,7 @@ static Y_INLINE void list_add(struct list_head *new_entry,
 
 }
 
-static Y_INLINE void list_add_tail(struct list_head *new_entry,
+static inline void list_add_tail(struct list_head *new_entry,
                                 struct list_head *list)
 {
        struct list_head *list_prev = list->prev;
@@ -79,7 +80,7 @@ static Y_INLINE void list_add_tail(struct list_head *new_entry,
 
 /* Take an element out of its current list, with or without
  * reinitialising the links.of the entry*/
-static Y_INLINE void list_del(struct list_head *entry)
+static inline void list_del(struct list_head *entry)
 {
        struct list_head *list_next = entry->next;
        struct list_head *list_prev = entry->prev;
@@ -89,7 +90,7 @@ static Y_INLINE void list_del(struct list_head *entry)
 
 }
 
-static Y_INLINE void list_del_init(struct list_head *entry)
+static inline void list_del_init(struct list_head *entry)
 {
        list_del(entry);
        entry->next = entry->prev = entry;
@@ -97,7 +98,7 @@ static Y_INLINE void list_del_init(struct list_head *entry)
 
 
 /* Test if the list is empty */
-static Y_INLINE int list_empty(struct list_head *entry)
+static inline int list_empty(struct list_head *entry)
 {
        return (entry->next == entry);
 }
@@ -121,7 +122,8 @@ static Y_INLINE int list_empty(struct list_head *entry)
 
 #define list_for_each_safe(itervar, save_var, list) \
        for (itervar = (list)->next, save_var = (list)->next->next; \
-               itervar != (list); itervar = save_var, save_var = save_var->next)
+               itervar != (list); \
+               itervar = save_var, save_var = save_var->next)
 
 
 #endif