Clean up includes of s_lock.h.

Users of spinlocks should use spin.h, not s_lock.h. And lwlock.h
hasn't utilized spinlocks for quite a while.

Discussion: https://postgr.es/m/20200618183041[email protected]

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index da3dae9e250f42e10c5d98560e5af9216e11fe05..a4dd233c7f9226b2af88436ae32a18d2570afc6e 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -35,7 +35,6 @@
 #include "common/username.h"
 #include "port/atomics.h"
 #include "postmaster/postmaster.h"
-#include "storage/s_lock.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/help_config.h"

diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index c2be198f28e6e20a9f585dcaf8bdbcbc86719d87..ad209acfac06873560b4a40cde1f7f5989a09c92 100644 (file)
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -23,7 +23,7 @@
 #define CONDITION_VARIABLE_H
 
 #include "storage/proclist_types.h"
-#include "storage/s_lock.h"
+#include "storage/spin.h"
 
 typedef struct
 {

diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index c04ae971485e311c741c6332232382e39573422f..af9b41795d26d9b789326dea60726efa24d5e848 100644 (file)
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -20,7 +20,6 @@
 
 #include "port/atomics.h"
 #include "storage/proclist_types.h"
-#include "storage/s_lock.h"
 
 struct PGPROC;