headers: Move lock.h into include/common/

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

criu/cr-restore.c

@@ -36,7 +36,7 @@
 #include "restorer.h"
 #include "sockets.h"
 #include "sk-packet.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "files.h"
 #include "files-reg.h"
 #include "pipes.h"

criu/files.c

@@ -22,7 +22,7 @@
 #include "common/list.h"
 #include "rst-malloc.h"
 #include "util-pie.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "sockets.h"
 #include "pstree.h"
 #include "tty.h"

criu/fsnotify.c

@@ -35,7 +35,7 @@
 #include "file-ids.h"
 #include "criu-log.h"
 #include "common/list.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "irmap.h"
 #include "cr_options.h"
 #include "namespaces.h"

criu/include/files.h

@@ -6,7 +6,7 @@
 #include "int.h"
 #include "common/compiler.h"
 #include "fcntl.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "common/list.h"
 #include "pid.h"
 #include "rst_info.h"

criu/include/parasite.h

@@ -16,7 +16,7 @@
 
 #include "image.h"
 #include "util-pie.h"
-#include "lock.h"
+#include "common/lock.h"
 
 #include "images/vma.pb-c.h"
 #include "images/tty.pb-c.h"

criu/include/restorer.h

@@ -10,7 +10,7 @@
 #include "types.h"
 #include "common/compiler.h"
 #include "asm/fpu.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "util.h"
 #include "asm/restorer.h"
 #include "config.h"

criu/include/rst_info.h

 #ifndef __CR_RST_INFO_H__
 #define __CR_RST_INFO_H__
 
-#include "lock.h"
+#include "common/lock.h"
 #include "common/list.h"
 #include "vma.h"
 

criu/include/shmem.h

@@ -2,7 +2,7 @@
 #define __CR_SHMEM_H__
 
 #include "int.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "images/vma.pb-c.h"
 
 struct _VmaEntry;

criu/log.c

@@ -18,7 +18,7 @@
 #include "cr_options.h"
 #include "servicefd.h"
 #include "rst-malloc.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "string.h"
 
 #define DEFAULT_LOGFD		STDERR_FILENO

criu/pie/parasite.c

@@ -14,7 +14,7 @@
 #include "config.h"
 #include "fcntl.h"
 #include "prctl.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "parasite-vdso.h"
 #include "criu-log.h"
 #include "tty.h"

criu/pie/restorer.c

@@ -31,7 +31,7 @@
 #include "sk-inet.h"
 #include "vma.h"
 
-#include "lock.h"
+#include "common/lock.h"
 #include "restorer.h"
 #include "aio.h"
 #include "seccomp.h"

criu/pstree.c

@@ -7,7 +7,7 @@
 #include "cr_options.h"
 #include "pstree.h"
 #include "rst-malloc.h"
-#include "lock.h"
+#include "common/lock.h"
 #include "namespaces.h"
 #include "files.h"
 #include "tty.h"

criu/include/lock.h → include/common/lock.h

-#ifndef __CR_LOCK_H__
-#define __CR_LOCK_H__
+#ifndef __CR_COMMON_LOCK_H__
+#define __CR_COMMON_LOCK_H__
 
 #include <stdint.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <limits.h>
 #include <errno.h>
-
-#include "atomic.h"
-#include "log.h"
+#include "common/asm/atomic.h"
 
 #define LOCK_BUG_ON(condition)							\
 	if ((condition))							\
@@ -156,4 +154,4 @@ static inline void mutex_unlock(mutex_t *m)
 	LOCK_BUG_ON(sys_futex((uint32_t *)&m->raw.counter, FUTEX_WAKE, 1, NULL, NULL, 0) < 0);
 }
 
-#endif /* __CR_LOCK_H__ */
+#endif /* __CR_COMMON_LOCK_H__ */