diff --git a/ChangeLog b/ChangeLog index f517f40d8dd..689105366a6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8703,3 +8703,5 @@ * nuttx/sched/init/os_start.c, semaphore/Make.defs, sem_initialize.c, and semaphore.h: Semaphore initialization is now only required if priority inheritance is enabled (2014-9-29). + * fs/Makefile and mqueue/: Add build support for messages queues as part + of the VFS (only build logic, no C files yet) (2014-9-29). diff --git a/arch/rgmp/src/bridge.c b/arch/rgmp/src/bridge.c index 71ab7444751..19aa7ef6887 100644 --- a/arch/rgmp/src/bridge.c +++ b/arch/rgmp/src/bridge.c @@ -41,7 +41,7 @@ #include #include #include -#include "fs.h" +#include "inode/inode.h" #include #include #include diff --git a/fs/dirent/fs_closedir.c b/fs/dirent/fs_closedir.c index 2f70d851710..6b74bbdf197 100644 --- a/fs/dirent/fs_closedir.c +++ b/fs/dirent/fs_closedir.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/dirent/fs_opendir.c b/fs/dirent/fs_opendir.c index dbbc9b78e21..198b4ffd4a1 100644 --- a/fs/dirent/fs_opendir.c +++ b/fs/dirent/fs_opendir.c @@ -49,7 +49,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/dirent/fs_readdir.c b/fs/dirent/fs_readdir.c index 6d87ce7b0c8..61d946c3df4 100644 --- a/fs/dirent/fs_readdir.c +++ b/fs/dirent/fs_readdir.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/dirent/fs_rewinddir.c b/fs/dirent/fs_rewinddir.c index ccb49abd41f..7ad252d8aa5 100644 --- a/fs/dirent/fs_rewinddir.c +++ b/fs/dirent/fs_rewinddir.c @@ -45,7 +45,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/dirent/fs_seekdir.c b/fs/dirent/fs_seekdir.c index c5d5fbcbbcc..f58274f43ab 100644 --- a/fs/dirent/fs_seekdir.c +++ b/fs/dirent/fs_seekdir.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/driver/driver.h b/fs/driver/driver.h new file mode 100644 index 00000000000..3c0831c64c9 --- /dev/null +++ b/fs/driver/driver.h @@ -0,0 +1,102 @@ +/**************************************************************************** + * fs/driver/driver.h + * + * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __FS_DRIVER_DRIVER_H +#define __FS_DRIVER_DRIVER_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + + /**************************************************************************** + * Global Variables + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +extern FAR struct inode *root_inode; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/* fs_findblockdriver.c *****************************************************/ +/**************************************************************************** + * Name: find_blockdriver + * + * Description: + * Return the inode of the block driver specified by 'pathname' + * + * Inputs: + * pathname - the full path to the block driver to be located + * mountflags - if MS_RDONLY is not set, then driver must support write + * operations (see include/sys/mount.h) + * ppinode - address of the location to return the inode reference + * + * Return: + * Returns zero on success or a negated errno on failure: + * + * EINVAL - pathname or pinode is NULL + * ENOENT - No block driver of this name is registered + * ENOTBLK - The inode associated with the pathname is not a block driver + * EACCESS - The MS_RDONLY option was not set but this driver does not + * support write access + * + ****************************************************************************/ + +int find_blockdriver(FAR const char *pathname, int mountflags, + FAR struct inode **ppinode); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __FS_DRIVER_DRIVER_H */ diff --git a/fs/driver/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c index a0add5cc751..99bbddfdda9 100644 --- a/fs/driver/fs_closeblockdriver.c +++ b/fs/driver/fs_closeblockdriver.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/driver/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c index 73133f25f16..ed5f240b0f1 100644 --- a/fs/driver/fs_findblockdriver.c +++ b/fs/driver/fs_findblockdriver.c @@ -38,13 +38,16 @@ ****************************************************************************/ #include + #include #include #include #include + #include -#include "fs.h" +#include "inode/inode.h" +#include "driver/driver.h" /**************************************************************************** * Private Functions diff --git a/fs/driver/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c index 8c89572d1fc..21a3d516e49 100644 --- a/fs/driver/fs_openblockdriver.c +++ b/fs/driver/fs_openblockdriver.c @@ -43,7 +43,8 @@ #include #include -#include "fs.h" +#include "inode/inode.h" +#include "driver/driver.h" /**************************************************************************** * Private Functions diff --git a/fs/driver/fs_registerblockdriver.c b/fs/driver/fs_registerblockdriver.c index 671ca2fa16e..6ef9308f590 100644 --- a/fs/driver/fs_registerblockdriver.c +++ b/fs/driver/fs_registerblockdriver.c @@ -44,7 +44,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor oDefinitions diff --git a/fs/driver/fs_registerdriver.c b/fs/driver/fs_registerdriver.c index b249861d136..db635cdfd13 100644 --- a/fs/driver/fs_registerdriver.c +++ b/fs/driver/fs_registerdriver.c @@ -44,7 +44,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/driver/fs_syslog.c b/fs/driver/fs_syslog.c index 053720747d0..93eaa1fc955 100644 --- a/fs/driver/fs_syslog.c +++ b/fs/driver/fs_syslog.c @@ -53,7 +53,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #if defined(CONFIG_SYSLOG) && defined(CONFIG_SYSLOG_CHAR) diff --git a/fs/driver/fs_unregisterblockdriver.c b/fs/driver/fs_unregisterblockdriver.c index f886cdce40f..1669a4d4ed8 100644 --- a/fs/driver/fs_unregisterblockdriver.c +++ b/fs/driver/fs_unregisterblockdriver.c @@ -41,7 +41,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/driver/fs_unregisterdriver.c b/fs/driver/fs_unregisterdriver.c index f9a073e195e..96e9e9bae18 100644 --- a/fs/driver/fs_unregisterdriver.c +++ b/fs/driver/fs_unregisterdriver.c @@ -41,7 +41,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c index e3c93a46822..5aff493c906 100644 --- a/fs/fat/fs_configfat.c +++ b/fs/fat/fs_configfat.c @@ -48,7 +48,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c index 8379471f7bb..0ff7935ca0c 100644 --- a/fs/fat/fs_fat32.c +++ b/fs/fat/fs_fat32.c @@ -63,7 +63,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" /**************************************************************************** diff --git a/fs/fat/fs_fat32attrib.c b/fs/fat/fs_fat32attrib.c index a652ee70bd0..b79e5275eb5 100644 --- a/fs/fat/fs_fat32attrib.c +++ b/fs/fat/fs_fat32attrib.c @@ -45,7 +45,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" /**************************************************************************** diff --git a/fs/fat/fs_fat32dirent.c b/fs/fat/fs_fat32dirent.c index 83368d2d0bc..b79c5110fe2 100644 --- a/fs/fat/fs_fat32dirent.c +++ b/fs/fat/fs_fat32dirent.c @@ -83,7 +83,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" /**************************************************************************** diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c index 1c570d301d7..61972d87b46 100644 --- a/fs/fat/fs_fat32util.c +++ b/fs/fat/fs_fat32util.c @@ -60,7 +60,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" /**************************************************************************** diff --git a/fs/fat/fs_mkfatfs.c b/fs/fat/fs_mkfatfs.c index 953ad0a364d..88d18591180 100644 --- a/fs/fat/fs_mkfatfs.c +++ b/fs/fat/fs_mkfatfs.c @@ -50,7 +50,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/fat/fs_writefat.c b/fs/fat/fs_writefat.c index f32a9d00325..f994d49efe9 100644 --- a/fs/fat/fs_writefat.c +++ b/fs/fat/fs_writefat.c @@ -48,7 +48,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_fat32.h" #include "fs_mkfatfs.h" diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c index 839cf4f210c..f39ea8b81af 100644 --- a/fs/inode/fs_files.c +++ b/fs/inode/fs_files.c @@ -49,7 +49,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_foreachinode.c b/fs/inode/fs_foreachinode.c index a5f32b7c0b8..0b4a6dc17b5 100644 --- a/fs/inode/fs_foreachinode.c +++ b/fs/inode/fs_foreachinode.c @@ -47,7 +47,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inode.c b/fs/inode/fs_inode.c index bcb0d285490..b3ed320a9e0 100644 --- a/fs/inode/fs_inode.c +++ b/fs/inode/fs_inode.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inodeaddref.c b/fs/inode/fs_inodeaddref.c index c0365dfcada..493c81e297d 100644 --- a/fs/inode/fs_inodeaddref.c +++ b/fs/inode/fs_inodeaddref.c @@ -41,7 +41,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inodebasename.c b/fs/inode/fs_inodebasename.c index d2a2ad46fef..517d968d2b3 100644 --- a/fs/inode/fs_inodebasename.c +++ b/fs/inode/fs_inodebasename.c @@ -39,7 +39,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inodefind.c b/fs/inode/fs_inodefind.c index d91567b9132..f474d556f17 100644 --- a/fs/inode/fs_inodefind.c +++ b/fs/inode/fs_inodefind.c @@ -42,7 +42,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inoderelease.c b/fs/inode/fs_inoderelease.c index 134a59ce254..912b12a6fff 100644 --- a/fs/inode/fs_inoderelease.c +++ b/fs/inode/fs_inoderelease.c @@ -44,7 +44,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inoderemove.c b/fs/inode/fs_inoderemove.c index b78bf651c56..52e77dfcf92 100644 --- a/fs/inode/fs_inoderemove.c +++ b/fs/inode/fs_inoderemove.c @@ -44,7 +44,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/inode/fs_inodereserve.c b/fs/inode/fs_inodereserve.c index 563be7f76bf..f0298cb8bef 100644 --- a/fs/inode/fs_inodereserve.c +++ b/fs/inode/fs_inodereserve.c @@ -45,7 +45,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/fs.h b/fs/inode/inode.h similarity index 91% rename from fs/fs.h rename to fs/inode/inode.h index a92a802bada..6bd412ac01f 100644 --- a/fs/fs.h +++ b/fs/inode/inode.h @@ -1,5 +1,5 @@ /**************************************************************************** - * fs/fs.h + * fs/inode/inode.h * * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _FS_FS_H -#define _FS_FS_H +#ifndef __FS_INODE_H +#define __FS_INODE_H /**************************************************************************** * Included Files @@ -114,20 +114,20 @@ typedef int (*foreach_inode_t)(FAR struct inode *node, * Global Variables ****************************************************************************/ -extern FAR struct inode *root_inode; - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif +EXTERN FAR struct inode *root_inode; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ /* fs_inode.c ***************************************************************/ /**************************************************************************** * Name: inode_semtake @@ -329,36 +329,9 @@ int files_close(int fd); void files_release(int fd); -/* fs_findblockdriver.c *****************************************************/ -/**************************************************************************** - * Name: find_blockdriver - * - * Description: - * Return the inode of the block driver specified by 'pathname' - * - * Inputs: - * pathname - the full path to the block driver to be located - * mountflags - if MS_RDONLY is not set, then driver must support write - * operations (see include/sys/mount.h) - * ppinode - address of the location to return the inode reference - * - * Return: - * Returns zero on success or a negated errno on failure: - * - * EINVAL - pathname or pinode is NULL - * ENOENT - No block driver of this name is registered - * ENOTBLK - The inode associated with the pathname is not a block driver - * EACCESS - The MS_RDONLY option was not set but this driver does not - * support write access - * - ****************************************************************************/ - -int find_blockdriver(FAR const char *pathname, int mountflags, - FAR struct inode **ppinode); - #undef EXTERN #if defined(__cplusplus) } #endif -#endif /* _FS_FS_H */ +#endif /* __FS_INODE_H */ diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c index cdce64bef3a..762b0d83258 100644 --- a/fs/mmap/fs_mmap.c +++ b/fs/mmap/fs_mmap.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "fs_rammap.h" /**************************************************************************** diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c index 04ed13323e0..ecd0e6d71f1 100644 --- a/fs/mmap/fs_munmap.c +++ b/fs/mmap/fs_munmap.c @@ -49,7 +49,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #include "fs_rammap.h" #ifdef CONFIG_FS_RAMMAP diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c index c8b2d0eca5b..e0b32504fde 100644 --- a/fs/mmap/fs_rammap.c +++ b/fs/mmap/fs_rammap.c @@ -49,7 +49,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #include "fs_rammap.h" #ifdef CONFIG_FS_RAMMAP diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c index 108035334f7..e8207cb423f 100644 --- a/fs/mount/fs_automount.c +++ b/fs/mount/fs_automount.c @@ -55,7 +55,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/mount/fs_foreachmountpoint.c b/fs/mount/fs_foreachmountpoint.c index f82c144cdba..dd412a19eb1 100644 --- a/fs/mount/fs_foreachmountpoint.c +++ b/fs/mount/fs_foreachmountpoint.c @@ -49,7 +49,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #ifndef CONFIG_DISABLE_MOUNTPOUNT diff --git a/fs/mount/fs_mount.c b/fs/mount/fs_mount.c index 2f3a71e0f29..4263f618bbe 100644 --- a/fs/mount/fs_mount.c +++ b/fs/mount/fs_mount.c @@ -47,7 +47,8 @@ #include -#include "fs.h" +#include "inode/inode.h" +#include "driver/driver.h" /* At least one filesystem must be defined, or this file will not compile. * It may be desire-able to make filesystems dynamically registered at diff --git a/fs/mount/fs_umount.c b/fs/mount/fs_umount.c index 42f6a5cc800..e7ea1c2d4be 100644 --- a/fs/mount/fs_umount.c +++ b/fs/mount/fs_umount.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/semaphore/sem_close.c b/fs/semaphore/sem_close.c index c1c41a6e733..d0691ed6932 100644 --- a/fs/semaphore/sem_close.c +++ b/fs/semaphore/sem_close.c @@ -47,7 +47,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #ifdef CONFIG_FS_NAMED_SEMAPHORES diff --git a/fs/semaphore/sem_open.c b/fs/semaphore/sem_open.c index 28e59cced66..e4a7da41722 100644 --- a/fs/semaphore/sem_open.c +++ b/fs/semaphore/sem_open.c @@ -52,7 +52,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #include "semaphore/semaphore.h" #ifdef CONFIG_FS_NAMED_SEMAPHORES diff --git a/fs/semaphore/sem_unlink.c b/fs/semaphore/sem_unlink.c index fa66c02be6b..399614273f2 100644 --- a/fs/semaphore/sem_unlink.c +++ b/fs/semaphore/sem_unlink.c @@ -48,7 +48,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #include "semaphore/semaphore.h" /**************************************************************************** diff --git a/fs/vfs/fs_close.c b/fs/vfs/fs_close.c index 3ed7b416590..dd346411979 100644 --- a/fs/vfs/fs_close.c +++ b/fs/vfs/fs_close.c @@ -48,7 +48,7 @@ # include #endif -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Global Functions diff --git a/fs/vfs/fs_dup.c b/fs/vfs/fs_dup.c index e7b6487da3c..2c4dd785d08 100644 --- a/fs/vfs/fs_dup.c +++ b/fs/vfs/fs_dup.c @@ -44,7 +44,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_dup2.c b/fs/vfs/fs_dup2.c index 4a8a52b9eeb..ff6eabdb405 100644 --- a/fs/vfs/fs_dup2.c +++ b/fs/vfs/fs_dup2.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /* This logic in this applies only when both socket and file descriptors are * in that case, this function descriminates which type of dup2 is being diff --git a/fs/vfs/fs_fcntl.c b/fs/vfs/fs_fcntl.c index 12afad4bdfc..6e4ebefb135 100644 --- a/fs/vfs/fs_fcntl.c +++ b/fs/vfs/fs_fcntl.c @@ -48,7 +48,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_filedup.c b/fs/vfs/fs_filedup.c index 81748e7a84e..f474a096e1e 100644 --- a/fs/vfs/fs_filedup.c +++ b/fs/vfs/fs_filedup.c @@ -45,7 +45,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/vfs/fs_filedup2.c b/fs/vfs/fs_filedup2.c index c45cf951f14..73b29c32e31 100644 --- a/fs/vfs/fs_filedup2.c +++ b/fs/vfs/fs_filedup2.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/vfs/fs_fsync.c b/fs/vfs/fs_fsync.c index 87d36a30e61..d608cda5f3a 100644 --- a/fs/vfs/fs_fsync.c +++ b/fs/vfs/fs_fsync.c @@ -47,7 +47,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c index 38d297f9204..b0a7ad78658 100644 --- a/fs/vfs/fs_ioctl.c +++ b/fs/vfs/fs_ioctl.c @@ -50,7 +50,7 @@ # include #endif -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Global Functions diff --git a/fs/vfs/fs_lseek.c b/fs/vfs/fs_lseek.c index 41bfb8d9ce9..a4a45b5fd28 100644 --- a/fs/vfs/fs_lseek.c +++ b/fs/vfs/fs_lseek.c @@ -45,7 +45,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #if CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/fs/vfs/fs_mkdir.c b/fs/vfs/fs_mkdir.c index 924dde43a61..6d037b37c1a 100644 --- a/fs/vfs/fs_mkdir.c +++ b/fs/vfs/fs_mkdir.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c index 24b574b51a5..4c0596e7f62 100644 --- a/fs/vfs/fs_open.c +++ b/fs/vfs/fs_open.c @@ -50,7 +50,7 @@ #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index 1f8aff0da16..70150891734 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -52,7 +52,7 @@ #include -#include "fs.h" +#include "inode/inode.h" #ifndef CONFIG_DISABLE_POLL diff --git a/fs/vfs/fs_read.c b/fs/vfs/fs_read.c index 4bf8f7947d5..5b0e09db0b4 100644 --- a/fs/vfs/fs_read.c +++ b/fs/vfs/fs_read.c @@ -46,7 +46,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/vfs/fs_rename.c b/fs/vfs/fs_rename.c index 97a084d23e7..cb9173dab97 100644 --- a/fs/vfs/fs_rename.c +++ b/fs/vfs/fs_rename.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_rmdir.c b/fs/vfs/fs_rmdir.c index 3bd70acb864..685704e0deb 100644 --- a/fs/vfs/fs_rmdir.c +++ b/fs/vfs/fs_rmdir.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_select.c b/fs/vfs/fs_select.c index 6adc89bc7a6..33a7a11bcf2 100644 --- a/fs/vfs/fs_select.c +++ b/fs/vfs/fs_select.c @@ -51,7 +51,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" #ifndef CONFIG_DISABLE_POLL diff --git a/fs/vfs/fs_stat.c b/fs/vfs/fs_stat.c index b96c26e7d9f..b8b62080bbb 100644 --- a/fs/vfs/fs_stat.c +++ b/fs/vfs/fs_stat.c @@ -44,7 +44,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/vfs/fs_statfs.c b/fs/vfs/fs_statfs.c index 6ca91593dc5..a70e970dc2c 100644 --- a/fs/vfs/fs_statfs.c +++ b/fs/vfs/fs_statfs.c @@ -45,7 +45,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions diff --git a/fs/vfs/fs_unlink.c b/fs/vfs/fs_unlink.c index 3154b6bd447..6a294196be8 100644 --- a/fs/vfs/fs_unlink.c +++ b/fs/vfs/fs_unlink.c @@ -43,7 +43,7 @@ #include #include -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Pre-processor Definitions diff --git a/fs/vfs/fs_write.c b/fs/vfs/fs_write.c index 93cd9706726..1c0ab8ea171 100644 --- a/fs/vfs/fs_write.c +++ b/fs/vfs/fs_write.c @@ -49,7 +49,7 @@ # include #endif -#include "fs.h" +#include "inode/inode.h" /**************************************************************************** * Private Functions