fsnotify: Rename inotify files to fsnotify

We will be handling both inotify and fanotify
objects here thus to make less confusion rename
the files to fsnotify.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

Makefile

@@ -116,7 +116,7 @@ OBJS		+= shmem.o
 OBJS		+= eventfd.o
 OBJS		+= eventpoll.o
 OBJS		+= mount.o
-OBJS		+= inotify.o
+OBJS		+= fsnotify.o
 OBJS		+= signalfd.o
 OBJS		+= pstree.o
 OBJS		+= protobuf.o

cr-dump.c

@@ -54,7 +54,7 @@
 #include "sk-inet.h"
 #include "eventfd.h"
 #include "eventpoll.h"
-#include "inotify.h"
+#include "fsnotify.h"
 #include "signalfd.h"
 #include "pstree.h"
 #include "mount.h"

cr-restore.c

@@ -49,7 +49,7 @@
 #include "namespaces.h"
 #include "shmem.h"
 #include "mount.h"
-#include "inotify.h"
+#include "fsnotify.h"
 #include "pstree.h"
 #include "net.h"
 #include "tty.h"

inotify.c → fsnotify.c

@@ -21,7 +21,7 @@
 
 #include "compiler.h"
 #include "asm/types.h"
-#include "inotify.h"
+#include "fsnotify.h"
 #include "proc_parse.h"
 #include "syscall.h"
 #include "crtools.h"
@@ -36,7 +36,7 @@
 #include "lock.h"
 
 #include "protobuf.h"
-#include "protobuf/inotify.pb-c.h"
+#include "protobuf/fsnotify.pb-c.h"
 
 #undef	LOG_PREFIX
 #define LOG_PREFIX "fsnotify: "

image.c

@@ -4,7 +4,7 @@
 #include "image.h"
 #include "eventpoll.h"
 #include "signalfd.h"
-#include "inotify.h"
+#include "fsnotify.h"
 #include "sockets.h"
 #include "uts_ns.h"
 #include "ipc_ns.h"

include/inotify.h → include/fsnotify.h

-#ifndef __CR_INOTIFY_H__
-#define __CR_INOTIFY_H__
+#ifndef __CR_FSNOTIFY_H__
+#define __CR_FSNOTIFY_H__
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -15,4 +15,4 @@ extern int collect_inotify(void);
 extern void show_inotify_wd(int fd_inotify_wd, struct cr_options *o);
 extern void show_inotify(int fd_inotify, struct cr_options *o);
 
-#endif /* __CR_INOTIFY_H__ */
+#endif /* __CR_FSNOTIFY_H__ */

include/proc_parse.h

@@ -9,7 +9,7 @@
 #include "../protobuf/eventfd.pb-c.h"
 #include "../protobuf/eventpoll.pb-c.h"
 #include "../protobuf/signalfd.pb-c.h"
-#include "../protobuf/inotify.pb-c.h"
+#include "../protobuf/fsnotify.pb-c.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"

protobuf.c

@@ -22,7 +22,7 @@
 #include "protobuf/eventfd.pb-c.h"
 #include "protobuf/eventpoll.pb-c.h"
 #include "protobuf/signalfd.pb-c.h"
-#include "protobuf/inotify.pb-c.h"
+#include "protobuf/fsnotify.pb-c.h"
 #include "protobuf/core.pb-c.h"
 #include "protobuf/mm.pb-c.h"
 #include "protobuf/pipe.pb-c.h"

protobuf/Makefile

@@ -10,7 +10,7 @@ PROTO_FILES	+= remap-file-path.proto
 PROTO_FILES	+= eventfd.proto
 PROTO_FILES	+= eventpoll.proto
 PROTO_FILES	+= fh.proto
-PROTO_FILES	+= inotify.proto
+PROTO_FILES	+= fsnotify.proto
 PROTO_FILES	+= signalfd.proto
 PROTO_FILES	+= fs.proto
 PROTO_FILES	+= pstree.proto