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/Kconfig

@@ -135,7 +135,6 @@ source "fs/mqueue/Kconfig"
 source "fs/shm/Kconfig"
 source "fs/mmap/Kconfig"
 source "fs/partition/Kconfig"
-source "fs/notify/Kconfig"
 source "fs/fat/Kconfig"
 source "fs/nfs/Kconfig"
 source "fs/nxffs/Kconfig"

fs/Make.defs

@@ -1,21 +0,0 @@
-# ##############################################################################
-# fs/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License.  You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-# ##############################################################################

fs/Makefile

@@ -66,7 +66,6 @@ include rpmsgfs/Make.defs
 include zipfs/Make.defs
 include mnemofs/Make.defs
 include v9fs/Make.defs
-include notify/Make.defs
 endif
 
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)fs

fs/driver/fs_registerblockdriver.c

@@ -32,7 +32,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 #ifndef CONFIG_DISABLE_MOUNTPOINT
 

fs/driver/fs_registerdriver.c

@@ -33,7 +33,7 @@
 #include <nuttx/sched_note.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Public Functions

fs/driver/fs_registermtddriver.c

@@ -33,7 +33,7 @@
 #include <nuttx/mtd/mtd.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 #if defined(CONFIG_MTD) && !defined(CONFIG_DISABLE_MOUNTPOINT)
 

fs/driver/fs_registerpipedriver.c

@@ -32,7 +32,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 #ifdef CONFIG_PIPES
 

fs/driver/fs_unregisterblockdriver.c

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

fs/driver/fs_unregisterdriver.c

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

fs/driver/fs_unregistermtddriver.c

@@ -30,7 +30,7 @@
 #include <nuttx/mtd/mtd.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Public Functions

fs/driver/fs_unregisterpipedriver.c

@@ -29,7 +29,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 #ifdef CONFIG_PIPES
 

fs/event/event_close.c

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

fs/event/event_open.c

@@ -36,7 +36,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 #include "event/event.h"
 
 /****************************************************************************

fs/fs_initialize.c

@@ -28,7 +28,6 @@
 #include <nuttx/reboot_notifier.h>
 #include <nuttx/trace.h>
 
-#include "notify/notify.h"
 #include "rpmsgfs/rpmsgfs.h"
 #include "inode/inode.h"
 #include "aio/aio.h"

fs/mount/fs_mount.c

@@ -37,7 +37,7 @@
 
 #include "driver/driver.h"
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fs/mount/fs_umount2.c

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

fs/mqueue/mq_open.c

@@ -41,7 +41,7 @@
 
 #include "inode/inode.h"
 #include "mqueue/mqueue.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Private Functions Prototypes

fs/mqueue/mq_unlink.c

@@ -36,7 +36,7 @@
 
 #include "inode/inode.h"
 #include "mqueue/mqueue.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Private Functions

fs/notify/CMakeLists.txt

@@ -1,25 +0,0 @@
-# ##############################################################################
-# fs/notify/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License.  You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-# ##############################################################################
-
-if(CONFIG_FS_NOTIFY)
-  target_sources(fs PRIVATE inotify.c)
-endif()

fs/notify/Kconfig

@@ -1,25 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-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

fs/notify/Make.defs

@@ -1,31 +0,0 @@
-############################################################################
-# fs/notify/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-# Include FSNOTIFY build support
-
-
-ifeq ($(CONFIG_FS_NOTIFY),y)
-CSRCS += inotify.c
-endif
-
-DEPPATH += --dep-path notify
-VPATH += :notify

fs/notify/notify.h

@@ -1,60 +0,0 @@
-/****************************************************************************
- * fs/notify/notify.h
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __FS_NOTIFY_NOTIFY_H
-#define __FS_NOTIFY_NOTIFY_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/fs/fs.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Type Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/* These are internal OS interface and are not available to applications */
-
-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

fs/semaphore/sem_close.c

@@ -35,7 +35,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 #ifdef CONFIG_FS_NAMED_SEMAPHORES
 

fs/semaphore/sem_open.c

@@ -42,7 +42,7 @@
 #include <nuttx/fs/fs.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 #include "semaphore/semaphore.h"
 
 #ifdef CONFIG_FS_NAMED_SEMAPHORES

fs/semaphore/sem_unlink.c

@@ -36,7 +36,7 @@
 #include <nuttx/semaphore.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 #include "semaphore/semaphore.h"
 
 /****************************************************************************

fs/shm/shm_open.c

@@ -31,7 +31,7 @@
 #include <errno.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 #include "shm/shmfs.h"
 
 /****************************************************************************

fs/shm/shm_unlink.c

@@ -29,7 +29,7 @@
 #include <errno.h>
 
 #include "inode/inode.h"
-#include "notify/notify.h"
+#include "vfs/vfs.h"
 
 /****************************************************************************
  * Private Functions

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_inotify.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/notify/inotify.c
+ * fs/vfs/fs_inotify.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

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 */