You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/03/22 13:24:25 UTC
[incubator-nuttx] 09/12: fs/: Remove support for CONFIG_FS_READABLE
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2b532ae4a8260a3b8d86e2235ca7f53a74deb58d
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Mar 21 10:58:46 2020 -0600
fs/: Remove support for CONFIG_FS_READABLE
---
fs/Kconfig | 6 ------
fs/binfs/Kconfig | 1 -
fs/cromfs/Kconfig | 1 -
fs/fat/Kconfig | 1 -
fs/hostfs/Kconfig | 1 -
fs/littlefs/Kconfig | 1 -
fs/mount/fs_mount.c | 49 ++++++++++++-------------------------------------
fs/nfs/Kconfig | 1 -
fs/nxffs/Kconfig | 1 -
fs/procfs/Kconfig | 1 -
fs/romfs/Kconfig | 1 -
fs/smartfs/Kconfig | 1 -
fs/spiffs/Kconfig | 1 -
fs/tmpfs/Kconfig | 1 -
14 files changed, 12 insertions(+), 55 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index c5a516d..d0055ed 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -53,12 +53,6 @@ config PSEUDOFS_SOFTLINKS
to link a directory in the pseudo-file system, such as /bin, to
to a directory in a mounted volume, say /mnt/sdcard/bin.
-config FS_READABLE
- bool
- default n
- ---help---
- Automatically selected if any readable file system is selected
-
source fs/aio/Kconfig
source fs/semaphore/Kconfig
source fs/mqueue/Kconfig
diff --git a/fs/binfs/Kconfig b/fs/binfs/Kconfig
index 8e5da6a..47871f1 100644
--- a/fs/binfs/Kconfig
+++ b/fs/binfs/Kconfig
@@ -7,7 +7,6 @@ config FS_BINFS
bool "BINFS File System"
default n
depends on BUILTIN
- select FS_READABLE
---help---
The BINFS file system is provides access to builtin applications through
the NuttX file system. The BINFS may, for example, be mount at /bin.
diff --git a/fs/cromfs/Kconfig b/fs/cromfs/Kconfig
index c493208..25a9f5a 100644
--- a/fs/cromfs/Kconfig
+++ b/fs/cromfs/Kconfig
@@ -7,7 +7,6 @@ config FS_CROMFS
bool "CROMFS file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
select LIBC_LZF
---help---
Enable Compessed Read-Only Filesystem (CROMFS) support
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
index ebbaa97..fd3bd46 100644
--- a/fs/fat/Kconfig
+++ b/fs/fat/Kconfig
@@ -7,7 +7,6 @@ config FS_FAT
bool "FAT file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable FAT filesystem support
diff --git a/fs/hostfs/Kconfig b/fs/hostfs/Kconfig
index e514007..2d69006 100644
--- a/fs/hostfs/Kconfig
+++ b/fs/hostfs/Kconfig
@@ -7,7 +7,6 @@ config FS_HOSTFS
bool "Host File System"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
The Host file system provides a mechanism to mount directories
from the host OS during simulation mode. The host directory
diff --git a/fs/littlefs/Kconfig b/fs/littlefs/Kconfig
index df403ed..c581739 100644
--- a/fs/littlefs/Kconfig
+++ b/fs/littlefs/Kconfig
@@ -1,7 +1,6 @@
config FS_LITTLEFS
bool "LITTLEFS File System"
default n
- select FS_READABLE
depends on !DISABLE_MOUNTPOINT
---help---
Build the LITTLEFS file system. https://github.com/ARMmbed/littlefs.
diff --git a/fs/mount/fs_mount.c b/fs/mount/fs_mount.c
index c6043af..18255eb 100644
--- a/fs/mount/fs_mount.c
+++ b/fs/mount/fs_mount.c
@@ -1,36 +1,20 @@
/****************************************************************************
* fs/mount/fs_mount.c
*
- * Copyright (C) 2007-2009, 2011-2013, 2015, 2017-2019 Gregory Nutt. All
- * rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
@@ -52,14 +36,6 @@
#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 file systems dynamically registered at
- * some time in the future, but at present, this file needs to know about
- * every configured filesystem.
- */
-
-#ifdef CONFIG_FS_READABLE
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -540,4 +516,3 @@ errout:
#endif /* BDFS_SUPPORT || MDFS_SUPPORT || NODFS_SUPPORT */
}
-#endif /* CONFIG_FS_READABLE */
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 580ba64..19a1a88 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -7,7 +7,6 @@ config NFS
bool "NFS client file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable network file system (NFS) client file system
diff --git a/fs/nxffs/Kconfig b/fs/nxffs/Kconfig
index 9232c52..ac3b762 100644
--- a/fs/nxffs/Kconfig
+++ b/fs/nxffs/Kconfig
@@ -7,7 +7,6 @@ config FS_NXFFS
bool "NXFFS file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable NuttX FLASH file system (NXFF) support.
diff --git a/fs/procfs/Kconfig b/fs/procfs/Kconfig
index 6e1289f..5ce77fc 100644
--- a/fs/procfs/Kconfig
+++ b/fs/procfs/Kconfig
@@ -6,7 +6,6 @@
config FS_PROCFS
bool "PROCFS File System"
default n
- select FS_READABLE
---help---
The PROCFS file system provides access to task status and other driver
status through the NuttX file system. The PROCFS may, for example, be
diff --git a/fs/romfs/Kconfig b/fs/romfs/Kconfig
index 4014cf6..f52a48e 100644
--- a/fs/romfs/Kconfig
+++ b/fs/romfs/Kconfig
@@ -7,7 +7,6 @@ config FS_ROMFS
bool "ROMFS file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable ROMFS filesystem support
diff --git a/fs/smartfs/Kconfig b/fs/smartfs/Kconfig
index 53ece00..21abccc 100644
--- a/fs/smartfs/Kconfig
+++ b/fs/smartfs/Kconfig
@@ -7,7 +7,6 @@ config FS_SMARTFS
bool "SMART file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable NuttX SMART Flash file system (SMARTFS) support.
diff --git a/fs/spiffs/Kconfig b/fs/spiffs/Kconfig
index 030a572..75e125f 100644
--- a/fs/spiffs/Kconfig
+++ b/fs/spiffs/Kconfig
@@ -6,7 +6,6 @@
config FS_SPIFFS
bool "SPIFFS File System"
default n
- select FS_READABLE
depends on !DISABLE_MOUNTPOINT
---help---
Build the SPIFFS file system. This is a port of version 0.3.7 of
diff --git a/fs/tmpfs/Kconfig b/fs/tmpfs/Kconfig
index d1a473b..f76755d 100644
--- a/fs/tmpfs/Kconfig
+++ b/fs/tmpfs/Kconfig
@@ -7,7 +7,6 @@ config FS_TMPFS
bool "TMPFS file system"
default n
depends on !DISABLE_MOUNTPOINT
- select FS_READABLE
---help---
Enable TMPFS filesystem support