fs: Move inotify.c from fs/notify/ to fs/vfs/

and merge fs/notify/notify.h into fs/vfs/vfs.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

fs/vfs/CMakeLists.txt

@@ -53,14 +53,18 @@ set(SRCS
     fs_syncfs.c
     fs_truncate.c)
 
+# File notify support
+
+if(CONFIG_FS_NOTIFY)
+  list(APPEND SRCS fs_inotify.c)
+endif()
+
 # File lock support
 
 if(NOT "${CONFIG_FS_LOCK_BUCKET_SIZE}" STREQUAL "0")
   list(APPEND SRCS fs_lock.c)
 endif()
 
-# Certain interfaces are not available if there is no mountpoint support
-
 if(NOT "${CONFIG_PSEUDOFS_SOFTLINKS}" STREQUAL "0")
   list(APPEND SRCS fs_link.c fs_symlink.c fs_readlink.c)
 endif()

fs/vfs/Kconfig

@@ -65,6 +65,27 @@ config SIGNAL_FD_NPOLLWAITERS
 
 endif # SIGNAL_FD
 
+config FS_NOTIFY
+	bool "FS Notify System"
+	default n
+	---help---
+		The Fsnotify System
+
+if FS_NOTIFY
+config FS_NOTIFY_BUCKET_SIZE
+	int "Dir hash bucket size"
+	default 64
+
+config FS_NOTIFY_MAX_EVENTS
+	int "Max events in one notify device"
+	default 1024
+
+config FS_NOTIFY_FD_POLLWAITERS
+	int "Max pollwaiters in one notify device"
+	default 2
+
+endif # FS_NOTIFY
+
 config FS_BACKTRACE
 	int "VFS backtrace"
 	default 0

fs/vfs/Make.defs

@@ -29,7 +29,9 @@ CSRCS += fs_rename.c fs_rmdir.c fs_select.c fs_sendfile.c fs_stat.c
 CSRCS += fs_statfs.c fs_uio.c fs_unlink.c fs_write.c fs_dir.c fs_fsync.c
 CSRCS += fs_syncfs.c fs_truncate.c
 
-# Certain interfaces are not available if there is no mountpoint support
+ifeq ($(CONFIG_FS_NOTIFY),y)
+CSRCS += fs_inotify.c
+endif
 
 ifneq ($(CONFIG_FS_LOCK_BUCKET_SIZE),0)
 CSRCS += fs_lock.c

fs/vfs/fs_close.c

@@ -39,7 +39,6 @@
 #  include <android/fdsan.h>
 #endif
 
-#include "notify/notify.h"
 #include "inode/inode.h"
 #include "sched/sched.h"
 #include "vfs.h"

fs/vfs/fs_fchstat.c

@@ -33,8 +33,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Private Functions

fs/vfs/fs_mkdir.c

@@ -34,8 +34,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/vfs/fs_open.c

@@ -42,7 +42,7 @@
 #include "sched/sched.h"
 #include "inode/inode.h"
 #include "driver/driver.h"
-#include "notify/notify.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Private Functions

fs/vfs/fs_pseudofile.c

@@ -40,8 +40,8 @@
 #include <nuttx/lib/math32.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
 #include "fs_heap.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Private Types

fs/vfs/fs_read.c

@@ -35,8 +35,8 @@
 
 #include <nuttx/cancelpt.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Private Functions

fs/vfs/fs_rename.c

@@ -37,9 +37,9 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/lib/lib.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
 #include "fs_heap.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/vfs/fs_rmdir.c

@@ -33,8 +33,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/vfs/fs_symlink.c

@@ -37,9 +37,9 @@
 #include <nuttx/lib/lib.h>
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
 #include "fs_heap.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/vfs/fs_truncate.c

@@ -34,8 +34,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Public Functions

fs/vfs/fs_unlink.c

@@ -33,8 +33,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/vfs/fs_write.c

@@ -35,8 +35,8 @@
 
 #include <nuttx/cancelpt.h>
 
-#include "notify/notify.h"
 #include "inode/inode.h"
+#include "vfs.h"
 
 /****************************************************************************
  * Private Functions

fs/vfs/vfs.h

@@ -27,6 +27,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/fs/fs.h>
 #include <fcntl.h>
 
 /****************************************************************************
@@ -105,4 +106,21 @@ int file_setlk(FAR struct file *filep, FAR struct flock *flock,
                bool nonblock);
 
 #endif /* CONFIG_FS_LOCK_BUCKET_SIZE */
+
+#ifdef CONFIG_FS_NOTIFY
+void notify_open(FAR const char *path, int oflags);
+void notify_close(FAR const char *path, int oflags);
+void notify_close2(FAR struct inode *inode);
+void notify_read(FAR struct file *filep);
+void notify_write(FAR struct file *filep);
+void notify_chstat(FAR struct file *filep);
+void notify_unlink(FAR const char *path);
+void notify_unmount(FAR const char *path);
+void notify_mkdir(FAR const char *path);
+void notify_create(FAR const char *path);
+void notify_rename(FAR const char *oldpath, bool oldisdir,
+                   FAR const char *newpath, bool newisdir);
+void notify_initialize(void);
+#endif /* CONFIG_FS_NOTIFY */
+
 #endif /* __FS_VFS_VFS_H */