From 91a0741c191bd1f983621b92f6816c68799b05d0 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Tue, 13 Jan 2015 17:50:25 +0100
Subject: apply patch to fix inodes

---
 nuttx/drivers/Makefile                   |  4 ++--
 nuttx/fs/driver/Make.defs                |  6 ++++++
 nuttx/fs/driver/fs_registerblockdriver.c |  4 ++++
 nuttx/fs/vfs/Make.defs                   | 12 +++++++++---
 nuttx/fs/vfs/fs_fsync.c                  |  4 ++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile
index 05aed285b..dec5903ea 100644
--- a/nuttx/drivers/Makefile
+++ b/nuttx/drivers/Makefile
@@ -70,10 +70,10 @@ include video$(DELIM)Make.defs
 include wireless$(DELIM)Make.defs
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-  CSRCS += dev_null.c dev_zero.c loop.c
+  CSRCS += dev_null.c dev_zero.c
 
 ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
-  CSRCS += ramdisk.c
+  CSRCS += ramdisk.c loop.c
 ifeq ($(CONFIG_DRVR_WRITEBUFFER),y)
   CSRCS += rwbuffer.c
 else
diff --git a/nuttx/fs/driver/Make.defs b/nuttx/fs/driver/Make.defs
index 587076dae..7cf8c344b 100644
--- a/nuttx/fs/driver/Make.defs
+++ b/nuttx/fs/driver/Make.defs
@@ -38,8 +38,14 @@
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 
 CSRCS += fs_registerdriver.c fs_unregisterdriver.c
+
+# Don't build-in block driver support if there are no mountpoints
+
+
+ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
 CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c
 CSRCS += fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c
+endif
 
 # System logging to a character device (or file)
 
diff --git a/nuttx/fs/driver/fs_registerblockdriver.c b/nuttx/fs/driver/fs_registerblockdriver.c
index 6ef9308f5..ea611022d 100644
--- a/nuttx/fs/driver/fs_registerblockdriver.c
+++ b/nuttx/fs/driver/fs_registerblockdriver.c
@@ -46,6 +46,8 @@
 
 #include "inode/inode.h"
 
+#ifndef CONFIG_DISABLE_MOUNTPOINT
+
 /****************************************************************************
  * Pre-processor oDefinitions
  ****************************************************************************/
@@ -122,3 +124,5 @@ int register_blockdriver(FAR const char *path,
   return ret;
 }
 
+#endif /* !CONFIG_DISABLE_MOUNTPOINT */
+
diff --git a/nuttx/fs/vfs/Make.defs b/nuttx/fs/vfs/Make.defs
index 1780eabd6..b43f24572 100644
--- a/nuttx/fs/vfs/Make.defs
+++ b/nuttx/fs/vfs/Make.defs
@@ -70,9 +70,15 @@ else
 # Common file/socket descriptor support
 
 CSRCS += fs_close.c fs_dup.c fs_dup2.c fs_fcntl.c fs_dupfd.c fs_dupfd2.c
-CSRCS += fs_fsync.c fs_getfilep.c fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c
-CSRCS += fs_poll.c fs_read.c fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c
-CSRCS += fs_select.c fs_unlink.c fs_write.c
+CSRCS += fs_getfilep.c fs_ioctl.c fs_lseek.c fs_mkdir.c fs_open.c fs_poll.c 
+CSRCS += fs_read.c fs_rename.c fs_rmdir.c fs_stat.c fs_statfs.c fs_select.c
+CSRCS += fs_unlink.c fs_write.c
+
+# Certain interfaces are not available if there is no mountpoint support
+
+ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
+CSRCS += fs_fsync.c
+endif
 
 # Support for positional file access
 
diff --git a/nuttx/fs/vfs/fs_fsync.c b/nuttx/fs/vfs/fs_fsync.c
index 24e184142..4d2311ea0 100644
--- a/nuttx/fs/vfs/fs_fsync.c
+++ b/nuttx/fs/vfs/fs_fsync.c
@@ -49,6 +49,8 @@
 
 #include "inode/inode.h"
 
+#ifndef CONFIG_DISABLE_MOUNTPOINT
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -146,3 +148,5 @@ int fsync(int fd)
 
   return file_fsync(filep);
 }
+
+#endif /* !CONFIG_DISABLE_MOUNTPOINT */
-- 
cgit v1.2.3