Commit 3a4257cc authored by J. R. Okajima's avatar J. R. Okajima
Browse files

5.0 20200302


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent ffe39ef3
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.0-20200127" #define AUFS_VERSION "5.0-20200302"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
...@@ -18,10 +18,11 @@ diff --git a/include/linux/rculist.h b/include/linux/rculist.h ...@@ -18,10 +18,11 @@ diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index e91ec9ddcd30..7c63916d235d 100644 index e91ec9ddcd30..7c63916d235d 100644
--- a/include/linux/rculist.h --- a/include/linux/rculist.h
+++ b/include/linux/rculist.h +++ b/include/linux/rculist.h
@@ -132,6 +132,16 @@ static inline void list_del_rcu(struct list_head *entry) @@ -131,6 +131,16 @@ static inline void list_del_rcu(struct list_head *entry)
entry->prev = LIST_POISON2;
} }
/** +/**
+ * list_del_init_rcu - deletes entry from list with re-initialization + * list_del_init_rcu - deletes entry from list with re-initialization
+ * @entry: the element to delete from the list. + * @entry: the element to delete from the list.
+*/ +*/
...@@ -31,10 +32,9 @@ index e91ec9ddcd30..7c63916d235d 100644 ...@@ -31,10 +32,9 @@ index e91ec9ddcd30..7c63916d235d 100644
+ INIT_LIST_HEAD(entry); + INIT_LIST_HEAD(entry);
+} +}
+ +
+/** /**
* hlist_del_init_rcu - deletes entry from hash list with re-initialization * hlist_del_init_rcu - deletes entry from hash list with re-initialization
* @n: the element to delete from the hash list. * @n: the element to delete from the hash list.
*
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c4f72e461d28..b4f4ba8ac9b2 100644 index c4f72e461d28..b4f4ba8ac9b2 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
...@@ -135,14 +135,15 @@ index c4f72e461d28..b4f4ba8ac9b2 100644 ...@@ -135,14 +135,15 @@ index c4f72e461d28..b4f4ba8ac9b2 100644
/* /*
* Remove all references to a lock class. The caller must hold the graph lock. * Remove all references to a lock class. The caller must hold the graph lock.
@@ -4133,18 +4197,22 @@ static void zap_class(struct lock_class *class) @@ -4132,19 +4196,23 @@ static void zap_class(struct lock_class *class)
{
int i; int i;
/* + /*
+ * pr_debug("%s:%d: %lu\n", + * pr_debug("%s:%d: %lu\n",
+ * __func__, __LINE__, class - lock_classes); + * __func__, __LINE__, class - lock_classes);
+ */ + */
+ /* /*
* Remove all dependencies this lock is * Remove all dependencies this lock is
* involved in: * involved in:
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment