summaryrefslogtreecommitdiff
path: root/lib/locking.h
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-08-02 17:58:14 +0200
committerMaria Matejka <mq@ucw.cz>2022-08-02 17:58:14 +0200
commit0072d11f3431165240656edf6ade473554b8747e (patch)
tree6c53bbbf0d3a4a3ad70846aae50995dc184cc5a5 /lib/locking.h
parent2e95d269d6bd42372d3273264e14775242b0744d (diff)
parentdb9153e216b6f1847ac9cdf170b1d14c04552e41 (diff)
Merge branch 'ballygarvan' into HEAD
Replacing the old 3.0-alpha0 cork mechanism with another one inside the routing table. This version should be simpler and also quite clear what it does, why and when.
Diffstat (limited to 'lib/locking.h')
-rw-r--r--lib/locking.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/locking.h b/lib/locking.h
index 0cbdead8..a9a8aa9b 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,8 +16,7 @@ struct lock_order {
struct domain_generic *the_bird;
struct domain_generic *proto;
struct domain_generic *rtable;
- struct domain_generic *cork;
- struct domain_generic *event;
+ struct domain_generic *resource;
};
extern _Thread_local struct lock_order locking_stack;