You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2021/07/15 09:04:36 UTC
[incubator-nuttx] branch revert-4118-attr created (now 9931fa7)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch revert-4118-attr
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
at 9931fa7 Revert "fs: Support the root file system attributes(mode, uid, gid and time)"
This branch includes the following new commits:
new ed69309 Revert "sim/nsh: Enable the attributes and soflinks of pseduo file system"
new 222f2cd Revert "fs: Move umask to task_info_s"
new 9931fa7 Revert "fs: Support the root file system attributes(mode, uid, gid and time)"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-nuttx] 01/03: Revert "sim/nsh: Enable the attributes and
soflinks of pseduo file system"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch revert-4118-attr
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ed69309e21528550e5552df1e47744697461bc10
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Jul 15 18:04:24 2021 +0900
Revert "sim/nsh: Enable the attributes and soflinks of pseduo file system"
This reverts commit 82c17fd6fa2b553fe027c173d7cf03591a9b6ce1.
---
boards/sim/sim/sim/configs/nsh/defconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig
index 2741806..9ac34ae 100644
--- a/boards/sim/sim/sim/configs/nsh/defconfig
+++ b/boards/sim/sim/sim/configs/nsh/defconfig
@@ -45,8 +45,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
-CONFIG_PSEUDOFS_ATTRIBUTES=y
-CONFIG_PSEUDOFS_SOFTLINKS=y
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
[incubator-nuttx] 02/03: Revert "fs: Move umask to task_info_s"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch revert-4118-attr
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 222f2cd56fe74bc5685479e6a8d22d06e1f03541
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Jul 15 18:04:24 2021 +0900
Revert "fs: Move umask to task_info_s"
This reverts commit a0f2f6c36243ea6afabcae3138128b790c1f8577.
---
fs/mqueue/mq_open.c | 3 ---
fs/semaphore/sem_open.c | 5 ++---
fs/vfs/fs_mkdir.c | 2 --
fs/vfs/fs_open.c | 3 ---
include/nuttx/tls.h | 11 ++++++-----
include/sys/stat.h | 1 -
libs/libc/misc/lib_umask.c | 27 ++++++++-------------------
7 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/fs/mqueue/mq_open.c b/fs/mqueue/mq_open.c
index bd6feee..7895aba 100644
--- a/fs/mqueue/mq_open.c
+++ b/fs/mqueue/mq_open.c
@@ -24,7 +24,6 @@
#include <nuttx/config.h>
-#include <sys/stat.h>
#include <stdbool.h>
#include <stdarg.h>
#include <stdio.h>
@@ -189,8 +188,6 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
attr = va_arg(ap, FAR struct mq_attr *);
}
- mode &= ~getumask();
-
/* Skip over any leading '/'. All message queue paths are relative to
* CONFIG_FS_MQUEUE_MPATH.
*/
diff --git a/fs/semaphore/sem_open.c b/fs/semaphore/sem_open.c
index ad5246a..3e34d1e 100644
--- a/fs/semaphore/sem_open.c
+++ b/fs/semaphore/sem_open.c
@@ -24,7 +24,6 @@
#include <nuttx/config.h>
-#include <sys/stat.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdarg.h>
@@ -87,7 +86,7 @@
*
****************************************************************************/
-FAR sem_t *sem_open(FAR const char *name, int oflags, ...)
+FAR sem_t *sem_open (FAR const char *name, int oflags, ...)
{
FAR struct inode *inode;
FAR struct nsem_inode_s *nsem;
@@ -175,7 +174,7 @@ FAR sem_t *sem_open(FAR const char *name, int oflags, ...)
*/
va_start(ap, oflags);
- mode = va_arg(ap, mode_t) & ~getumask();
+ mode = va_arg(ap, mode_t);
value = va_arg(ap, unsigned);
va_end(ap);
diff --git a/fs/vfs/fs_mkdir.c b/fs/vfs/fs_mkdir.c
index aae409a..0ecf95e 100644
--- a/fs/vfs/fs_mkdir.c
+++ b/fs/vfs/fs_mkdir.c
@@ -63,8 +63,6 @@ int mkdir(const char *pathname, mode_t mode)
int errcode;
int ret;
- mode &= ~getumask();
-
/* Find the inode that includes this path */
SETUP_SEARCH(&desc, pathname, false);
diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c
index 201875e..2804c2c 100644
--- a/fs/vfs/fs_open.c
+++ b/fs/vfs/fs_open.c
@@ -25,7 +25,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <stdbool.h>
#include <fcntl.h>
#include <sched.h>
@@ -70,8 +69,6 @@ static int file_vopen(FAR struct file *filep,
{
mode = va_arg(ap, mode_t);
}
-
- mode &= ~getumask();
#endif
/* Get an inode for this file */
diff --git a/include/nuttx/tls.h b/include/nuttx/tls.h
index d893059..a7d28f3 100644
--- a/include/nuttx/tls.h
+++ b/include/nuttx/tls.h
@@ -63,14 +63,15 @@
struct task_info_s
{
- sem_t ta_sem;
- mode_t ta_umask; /* File mode creation mask */
+ sem_t ta_sem;
+
#if CONFIG_TLS_NELEM > 0
- tls_ndxset_t ta_tlsset; /* Set of TLS indexes allocated */
- tls_dtor_t ta_tlsdtor[CONFIG_TLS_NELEM]; /* List of TLS destructors */
+ tls_ndxset_t ta_tlsset; /* Set of TLS indexes allocated */
+ tls_dtor_t ta_tlsdtor[CONFIG_TLS_NELEM]; /* List of TLS destructors */
#endif
+
#ifndef CONFIG_BUILD_KERNEL
- struct getopt_s ta_getopt; /* Globals used by getopt() */
+ struct getopt_s ta_getopt; /* Globals used by getopt() */
#endif
};
diff --git a/include/sys/stat.h b/include/sys/stat.h
index b1e8bcc..61e2afd 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -166,7 +166,6 @@ int fchmod(int fd, mode_t mode);
int futimens(int fd, const struct timespec times[2]);
mode_t umask(mode_t mask);
-mode_t getumask(void);
#undef EXTERN
#if defined(__cplusplus)
diff --git a/libs/libc/misc/lib_umask.c b/libs/libc/misc/lib_umask.c
index 995046c..6cf6214 100644
--- a/libs/libc/misc/lib_umask.c
+++ b/libs/libc/misc/lib_umask.c
@@ -23,7 +23,12 @@
****************************************************************************/
#include <sys/stat.h>
-#include <nuttx/tls.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static mode_t g_mask;
/****************************************************************************
* Public Functions
@@ -45,24 +50,8 @@
mode_t umask(mode_t mask)
{
- FAR struct task_info_s *info;
- mode_t prev;
-
- info = task_get_info();
- prev = info->ta_umask;
- info->ta_umask = mask;
+ mode_t prev = g_mask;
+ g_mask = mask & 0777;
return prev;
}
-
-/****************************************************************************
- * Name: getumask
- ****************************************************************************/
-
-mode_t getumask(void)
-{
- FAR struct task_info_s *info;
-
- info = task_get_info();
- return info->ta_umask;
-}
[incubator-nuttx] 03/03: Revert "fs: Support the root file system
attributes(mode, uid, gid and time)"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch revert-4118-attr
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9931fa7263d7fca660210604cae9a51cdb16bd34
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Jul 15 18:04:24 2021 +0900
Revert "fs: Support the root file system attributes(mode, uid, gid and time)"
This reverts commit 0148e1d50140777a7981a6078f0f6acb9d74ee73.
---
fs/Kconfig | 8 --------
fs/driver/fs_registerblockdriver.c | 7 +++++--
fs/driver/fs_registerdriver.c | 7 +++++--
fs/driver/fs_registermtddriver.c | 7 +++++--
fs/fat/fs_fat32.c | 4 ++++
fs/inode/fs_inodereserve.c | 18 +++++-------------
fs/inode/inode.h | 4 +---
fs/mount/fs_mount.c | 5 ++++-
fs/mqueue/mq_open.c | 10 +++++-----
fs/nxffs/nxffs_open.c | 4 ++++
fs/romfs/fs_romfs.c | 4 ++++
fs/semaphore/sem_open.c | 6 ++++--
fs/unionfs/fs_unionfs.c | 7 +++++--
fs/vfs/fs_mkdir.c | 2 +-
fs/vfs/fs_open.c | 7 +++++--
fs/vfs/fs_rename.c | 9 ++-------
fs/vfs/fs_stat.c | 11 -----------
fs/vfs/fs_symlink.c | 2 +-
include/nuttx/fs/fs.h | 14 ++++----------
include/nuttx/mqueue.h | 8 +++++---
sched/mqueue/mq_msgqalloc.c | 4 +++-
21 files changed, 72 insertions(+), 76 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index d646d06..e8f8b29 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -47,14 +47,6 @@ config DISABLE_PSEUDOFS_OPERATIONS
However, in practical embedded system, they are seldom needed and
you can save a little FLASH space by disabling the capability.
-config PSEUDOFS_ATTRIBUTES
- bool "Pseudo-filesystem attributes"
- default n
- depends on !DISABLE_PSEUDOFS_OPERATIONS
- ---help---
- Enable support for attributes(e.g. mode, uid, gid and time)
- in the pseudo file system.
-
config PSEUDOFS_SOFTLINKS
bool "Pseudo-filesystem soft links"
default n
diff --git a/fs/driver/fs_registerblockdriver.c b/fs/driver/fs_registerblockdriver.c
index 2c3e9c5..33a32c3 100644
--- a/fs/driver/fs_registerblockdriver.c
+++ b/fs/driver/fs_registerblockdriver.c
@@ -46,7 +46,7 @@
* Input Parameters:
* path - The path to the inode to create
* bops - The block driver operations structure
- * mode - inmode privileges
+ * mode - inmode privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
@@ -79,7 +79,7 @@ int register_blockdriver(FAR const char *path,
return ret;
}
- ret = inode_reserve(path, mode, &node);
+ ret = inode_reserve(path, &node);
if (ret >= 0)
{
/* We have it, now populate it with block driver specific information.
@@ -89,6 +89,9 @@ int register_blockdriver(FAR const char *path,
INODE_SET_BLOCK(node);
node->u.i_bops = bops;
+#ifdef CONFIG_FILE_MODE
+ node->i_mode = mode;
+#endif
node->i_private = priv;
ret = OK;
}
diff --git a/fs/driver/fs_registerdriver.c b/fs/driver/fs_registerdriver.c
index e663300..900364b 100644
--- a/fs/driver/fs_registerdriver.c
+++ b/fs/driver/fs_registerdriver.c
@@ -44,7 +44,7 @@
* Input Parameters:
* path - The path to the inode to create
* fops - The file operations structure
- * mode - inmode privileges
+ * mode - inmode privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
@@ -75,7 +75,7 @@ int register_driver(FAR const char *path,
return ret;
}
- ret = inode_reserve(path, mode, &node);
+ ret = inode_reserve(path, &node);
if (ret >= 0)
{
/* We have it, now populate it with driver specific information.
@@ -85,6 +85,9 @@ int register_driver(FAR const char *path,
INODE_SET_DRIVER(node);
node->u.i_ops = fops;
+#ifdef CONFIG_FILE_MODE
+ node->i_mode = mode;
+#endif
node->i_private = priv;
ret = OK;
}
diff --git a/fs/driver/fs_registermtddriver.c b/fs/driver/fs_registermtddriver.c
index 98e49d9..02c6140 100644
--- a/fs/driver/fs_registermtddriver.c
+++ b/fs/driver/fs_registermtddriver.c
@@ -47,7 +47,7 @@
* Input Parameters:
* path - The path to the inode to create
* mtd - The MTD driver structure
- * mode - inode privileges
+ * mode - inode privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
@@ -79,7 +79,7 @@ int register_mtddriver(FAR const char *path, FAR struct mtd_dev_s *mtd,
return ret;
}
- ret = inode_reserve(path, mode, &node);
+ ret = inode_reserve(path, &node);
if (ret >= 0)
{
/* We have it, now populate it with block driver specific information.
@@ -89,6 +89,9 @@ int register_mtddriver(FAR const char *path, FAR struct mtd_dev_s *mtd,
INODE_SET_MTD(node);
node->u.i_mtd = mtd;
+#ifdef CONFIG_FILE_MODE
+ node->i_mode = mode;
+#endif
node->i_private = priv;
ret = OK;
}
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index 30cbd34..7b58af1 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -226,6 +226,10 @@ static int fat_open(FAR struct file *filep, FAR const char *relpath,
goto errout_with_semaphore;
}
+ /* TODO: if CONFIG_FILE_MODE=y, need check for privileges based on
+ * inode->i_mode
+ */
+
/* Check if the caller has sufficient privileges to open the file */
readonly = ((DIR_GETATTRIBUTES(direntry) & FATATTR_READONLY) != 0);
diff --git a/fs/inode/fs_inodereserve.c b/fs/inode/fs_inodereserve.c
index ffbf509..17b82cc 100644
--- a/fs/inode/fs_inodereserve.c
+++ b/fs/inode/fs_inodereserve.c
@@ -69,7 +69,7 @@ static void inode_namecpy(char *dest, const char *src)
* Name: inode_alloc
****************************************************************************/
-static FAR struct inode *inode_alloc(FAR const char *name, mode_t mode)
+static FAR struct inode *inode_alloc(FAR const char *name)
{
FAR struct inode *node;
int namelen;
@@ -78,12 +78,6 @@ static FAR struct inode *inode_alloc(FAR const char *name, mode_t mode)
node = (FAR struct inode *)kmm_zalloc(FSNODE_SIZE(namelen));
if (node)
{
-#ifdef CONFIG_PSEUDOFS_ATTRIBUTES
- node->i_mode = mode;
- clock_gettime(CLOCK_REALTIME, &node->i_atime);
- node->i_mtime = node->i_atime;
- node->i_ctime = node->i_atime;
-#endif
inode_namecpy(node->i_name, name);
}
@@ -134,7 +128,7 @@ static void inode_insert(FAR struct inode *node,
void inode_root_reserve(void)
{
- g_root_inode = inode_alloc("", 0777);
+ g_root_inode = inode_alloc("");
}
/****************************************************************************
@@ -146,7 +140,6 @@ void inode_root_reserve(void)
*
* Input Parameters:
* path - The path to the inode to create
- * mode - inmode privileges
* inode - The location to return the inode pointer
*
* Returned Value:
@@ -162,8 +155,7 @@ void inode_root_reserve(void)
*
****************************************************************************/
-int inode_reserve(FAR const char *path,
- mode_t mode, FAR struct inode **inode)
+int inode_reserve(FAR const char *path, FAR struct inode **inode)
{
struct inode_search_s desc;
FAR struct inode *left;
@@ -216,7 +208,7 @@ int inode_reserve(FAR const char *path,
{
/* Insert an operationless node */
- node = inode_alloc(name, 0777);
+ node = inode_alloc(name);
if (node != NULL)
{
inode_insert(node, left, parent);
@@ -231,7 +223,7 @@ int inode_reserve(FAR const char *path,
}
else
{
- node = inode_alloc(name, mode);
+ node = inode_alloc(name);
if (node != NULL)
{
inode_insert(node, left, parent);
diff --git a/fs/inode/inode.h b/fs/inode/inode.h
index fc6a0a3..a439930 100644
--- a/fs/inode/inode.h
+++ b/fs/inode/inode.h
@@ -296,7 +296,6 @@ void inode_root_reserve(void);
*
* Input Parameters:
* path - The path to the inode to create
- * mode - inmode privileges
* inode - The location to return the inode pointer
*
* Returned Value:
@@ -309,8 +308,7 @@ void inode_root_reserve(void);
*
****************************************************************************/
-int inode_reserve(FAR const char *path,
- mode_t mode, FAR struct inode **inode);
+int inode_reserve(FAR const char *path, FAR struct inode **inode);
/****************************************************************************
* Name: inode_unlink
diff --git a/fs/mount/fs_mount.c b/fs/mount/fs_mount.c
index 7947701..1057d71 100644
--- a/fs/mount/fs_mount.c
+++ b/fs/mount/fs_mount.c
@@ -374,7 +374,7 @@ int nx_mount(FAR const char *source, FAR const char *target,
*/
{
- ret = inode_reserve(target, 0777, &mountpt_inode);
+ ret = inode_reserve(target, &mountpt_inode);
if (ret < 0)
{
/* inode_reserve can fail for a couple of reasons, but the most
@@ -450,6 +450,9 @@ int nx_mount(FAR const char *source, FAR const char *target,
INODE_SET_MOUNTPT(mountpt_inode);
mountpt_inode->u.i_mops = mops;
+#ifdef CONFIG_FILE_MODE
+ mountpt_inode->i_mode = mode;
+#endif
mountpt_inode->i_private = fshandle;
inode_semgive();
diff --git a/fs/mqueue/mq_open.c b/fs/mqueue/mq_open.c
index 7895aba..2eadefd 100644
--- a/fs/mqueue/mq_open.c
+++ b/fs/mqueue/mq_open.c
@@ -274,7 +274,7 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
goto errout_with_lock;
}
- ret = inode_reserve(fullpath, mode, &inode);
+ ret = inode_reserve(fullpath, &inode);
inode_semgive();
if (ret < 0)
@@ -286,7 +286,7 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
* be created with a reference count of zero.
*/
- msgq = (FAR struct mqueue_inode_s *)nxmq_alloc_msgq(attr);
+ msgq = (FAR struct mqueue_inode_s *)nxmq_alloc_msgq(mode, attr);
if (!msgq)
{
ret = -ENOSPC;
@@ -406,7 +406,7 @@ void nxmq_pollnotify(FAR struct mqueue_inode_s *msgq, pollevent_t eventset)
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
*
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. struct mq_attr *attr. The mq_maxmsg attribute
* is used at the time that the message queue is
* created to determine the maximum number of
@@ -453,7 +453,7 @@ int file_mq_open(FAR struct file *mq,
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
*
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. struct mq_attr *attr. The mq_maxmsg attribute
* is used at the time that the message queue is
* created to determine the maximum number of
@@ -495,7 +495,7 @@ mqd_t nxmq_open(FAR const char *mq_name, int oflags, ...)
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
*
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. struct mq_attr *attr. The mq_maxmsg attribute
* is used at the time that the message queue is
* created to determine the maximum number of
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 13c5a03..70b6e5f 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -1003,6 +1003,10 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
volume = (FAR struct nxffs_volume_s *)filep->f_inode->i_private;
DEBUGASSERT(volume != NULL);
+#ifdef CONFIG_FILE_MODE
+# warning "Missing check for privileges based on inode->i_mode"
+#endif
+
/* Limitation: A file must be opened for reading or writing, but not both.
* There is no general way of extending the size of a file. Extending the
* file size of possible if the file to be extended is the last in the
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index 8be82ee..76b95ff 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -225,6 +225,10 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
goto errout_with_semaphore;
}
+#ifdef CONFIG_FILE_MODE
+# warning "Missing check for privileges based on inode->i_mode"
+#endif
+
/* Create an instance of the file private data to describe the opened
* file.
*/
diff --git a/fs/semaphore/sem_open.c b/fs/semaphore/sem_open.c
index 3e34d1e..11606fd 100644
--- a/fs/semaphore/sem_open.c
+++ b/fs/semaphore/sem_open.c
@@ -74,7 +74,7 @@
* unless one of this name already exists.
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. unsigned int value. This initial value of the semaphore. Valid
* initial values of the semaphore must be less than or equal to
* SEM_VALUE_MAX.
@@ -178,6 +178,8 @@ FAR sem_t *sem_open (FAR const char *name, int oflags, ...)
value = va_arg(ap, unsigned);
va_end(ap);
+ UNUSED(mode);
+
/* Check the semaphore value */
if (value > SEM_VALUE_MAX)
@@ -197,7 +199,7 @@ FAR sem_t *sem_open (FAR const char *name, int oflags, ...)
goto errout_with_lock;
}
- ret = inode_reserve(fullpath, mode, &inode);
+ ret = inode_reserve(fullpath, &inode);
inode_semgive();
if (ret < 0)
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index 9ead2b1..d64b194 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -2633,7 +2633,7 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
* for now, however.
*/
- ret = inode_reserve(mountpt, 0777, &mpinode);
+ ret = inode_reserve(mountpt, &mpinode);
if (ret < 0)
{
/* inode_reserve can fail for a couple of reasons, but the most likely
@@ -2652,7 +2652,10 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
INODE_SET_MOUNTPT(mpinode);
- mpinode->u.i_mops = &unionfs_operations;
+ mpinode->u.i_mops = &unionfs_operations;
+#ifdef CONFIG_FILE_MODE
+ mpinode->i_mode = 0755;
+#endif
/* Call unionfs_dobind to do the real work. */
diff --git a/fs/vfs/fs_mkdir.c b/fs/vfs/fs_mkdir.c
index 0ecf95e..5f18327 100644
--- a/fs/vfs/fs_mkdir.c
+++ b/fs/vfs/fs_mkdir.c
@@ -137,7 +137,7 @@ int mkdir(const char *pathname, mode_t mode)
goto errout_with_search;
}
- ret = inode_reserve(pathname, mode, &inode);
+ ret = inode_reserve(pathname, &inode);
inode_semgive();
if (ret < 0)
diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c
index 2804c2c..3619f4f 100644
--- a/fs/vfs/fs_open.c
+++ b/fs/vfs/fs_open.c
@@ -51,7 +51,7 @@ static int file_vopen(FAR struct file *filep,
{
struct inode_search_s desc;
FAR struct inode *inode;
-#ifndef CONFIG_DISABLE_MOUNTPOINT
+#if defined(CONFIG_FILE_MODE) || !defined(CONFIG_DISABLE_MOUNTPOINT)
mode_t mode = 0666;
#endif
int ret;
@@ -61,7 +61,10 @@ static int file_vopen(FAR struct file *filep,
return -EINVAL;
}
-#ifndef CONFIG_DISABLE_MOUNTPOINT
+#ifdef CONFIG_FILE_MODE
+# ifdef CONFIG_CPP_HAVE_WARNING
+# warning "File creation not implemented"
+# endif
/* If the file is opened for creation, then get the mode bits */
diff --git a/fs/vfs/fs_rename.c b/fs/vfs/fs_rename.c
index 24854a1..c180b2b 100644
--- a/fs/vfs/fs_rename.c
+++ b/fs/vfs/fs_rename.c
@@ -177,7 +177,7 @@ next_subdir:
goto errout;
}
- ret = inode_reserve(newpath, 0777, &newinode);
+ ret = inode_reserve(newpath, &newinode);
if (ret < 0)
{
/* It is an error if a node at newpath already exists in the tree
@@ -194,13 +194,8 @@ next_subdir:
newinode->i_child = oldinode->i_child; /* Link to lower level inode */
newinode->i_flags = oldinode->i_flags; /* Flags for inode */
newinode->u.i_ops = oldinode->u.i_ops; /* Inode operations */
-#ifdef CONFIG_PSEUDOFS_ATTRIBUTES
+#ifdef CONFIG_FILE_MODE
newinode->i_mode = oldinode->i_mode; /* Access mode flags */
- newinode->i_owner = oldinode->i_owner; /* Owner */
- newinode->i_group = oldinode->i_group; /* Group */
- newinode->i_atime = oldinode->i_atime; /* Time of last access */
- newinode->i_mtime = oldinode->i_mtime; /* Time of last modification */
- newinode->i_ctime = oldinode->i_ctime; /* Time of last status change */
#endif
newinode->i_private = oldinode->i_private; /* Per inode driver private data */
diff --git a/fs/vfs/fs_stat.c b/fs/vfs/fs_stat.c
index e4048f8..0e40cbf 100644
--- a/fs/vfs/fs_stat.c
+++ b/fs/vfs/fs_stat.c
@@ -348,8 +348,6 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve)
{
RESET_BUF(buf);
}
-
- return ret;
}
else
{
@@ -430,14 +428,5 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve)
buf->st_mode |= S_IFDIR | S_IROTH | S_IRGRP | S_IRUSR;
}
-#ifdef CONFIG_PSEUDOFS_ATTRIBUTES
- buf->st_mode |= inode->i_mode;
- buf->st_uid = inode->i_owner;
- buf->st_gid = inode->i_group;
- buf->st_atim = inode->i_atime;
- buf->st_mtim = inode->i_mtime;
- buf->st_ctim = inode->i_ctime;
-#endif
-
return OK;
}
diff --git a/fs/vfs/fs_symlink.c b/fs/vfs/fs_symlink.c
index 8fc80fb..07a3f90 100644
--- a/fs/vfs/fs_symlink.c
+++ b/fs/vfs/fs_symlink.c
@@ -148,7 +148,7 @@ int symlink(FAR const char *path1, FAR const char *path2)
goto errout_with_search;
}
- ret = inode_reserve(path2, 0777, &inode);
+ ret = inode_reserve(path2, &inode);
inode_semgive();
if (ret < 0)
diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
index 5210f44..7bdf79c 100644
--- a/include/nuttx/fs/fs.h
+++ b/include/nuttx/fs/fs.h
@@ -32,7 +32,6 @@
#include <stdarg.h>
#include <stdint.h>
#include <stdbool.h>
-#include <time.h>
#include <nuttx/semaphore.h>
@@ -354,13 +353,8 @@ struct inode
int16_t i_crefs; /* References to inode */
uint16_t i_flags; /* Flags for inode */
union inode_ops_u u; /* Inode operations */
-#ifdef CONFIG_PSEUDOFS_ATTRIBUTES
+#ifdef CONFIG_FILE_MODE
mode_t i_mode; /* Access mode flags */
- uid_t i_owner; /* Owner */
- gid_t i_group; /* Group */
- struct timespec i_atime; /* Time of last access */
- struct timespec i_mtime; /* Time of last modification */
- struct timespec i_ctime; /* Time of last status change */
#endif
FAR void *i_private; /* Per inode driver private data */
char i_name[1]; /* Name of inode (variable) */
@@ -498,7 +492,7 @@ void fs_initialize(void);
* Input Parameters:
* path - The path to the inode to create
* fops - The file operations structure
- * mode - Access privileges
+ * mode - Access privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
@@ -525,7 +519,7 @@ int register_driver(FAR const char *path,
* Input Parameters:
* path - The path to the inode to create
* bops - The block driver operations structure
- * mode - Access privileges
+ * mode - Access privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
@@ -603,7 +597,7 @@ int unregister_blockdriver(FAR const char *path);
* Input Parameters:
* path - The path to the inode to create
* mtd - The MTD driver structure
- * mode - inode privileges
+ * mode - inode privileges (not used)
* priv - Private, user data that will be associated with the inode.
*
* Returned Value:
diff --git a/include/nuttx/mqueue.h b/include/nuttx/mqueue.h
index 81d7956..90688cd 100644
--- a/include/nuttx/mqueue.h
+++ b/include/nuttx/mqueue.h
@@ -144,7 +144,7 @@ struct task_group_s; /* Forward reference */
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
*
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. struct mq_attr *attr. The mq_maxmsg attribute
* is used at the time that the message queue is
* created to determine the maximum number of
@@ -382,6 +382,7 @@ void nxmq_free_msgq(FAR struct mqueue_inode_s *msgq);
* It allocates and initializes a struct mqueue_inode_s structure.
*
* Input Parameters:
+ * mode - mode_t value is ignored
* attr - The mq_maxmsg attribute is used at the time that the message
* queue is created to determine the maximum number of
* messages that may be placed in the message queue.
@@ -392,7 +393,8 @@ void nxmq_free_msgq(FAR struct mqueue_inode_s *msgq);
*
****************************************************************************/
-FAR struct mqueue_inode_s *nxmq_alloc_msgq(FAR struct mq_attr *attr);
+FAR struct mqueue_inode_s *nxmq_alloc_msgq(mode_t mode,
+ FAR struct mq_attr *attr);
/****************************************************************************
* Name: nxmq_pollnotify
@@ -432,7 +434,7 @@ void nxmq_pollnotify(FAR struct mqueue_inode_s *msgq, pollevent_t eventset);
* Optional parameters. When the O_CREAT flag is specified, two optional
* parameters are expected:
*
- * 1. mode_t mode, and
+ * 1. mode_t mode (ignored), and
* 2. struct mq_attr *attr. The mq_maxmsg attribute
* is used at the time that the message queue is
* created to determine the maximum number of
diff --git a/sched/mqueue/mq_msgqalloc.c b/sched/mqueue/mq_msgqalloc.c
index 7209f43..e606ce6 100644
--- a/sched/mqueue/mq_msgqalloc.c
+++ b/sched/mqueue/mq_msgqalloc.c
@@ -46,6 +46,7 @@
* It allocates and initializes a struct mqueue_inode_s structure.
*
* Input Parameters:
+ * mode - mode_t value is ignored
* attr - The mq_maxmsg attribute is used at the time that the message
* queue is created to determine the maximum number of
* messages that may be placed in the message queue.
@@ -56,7 +57,8 @@
*
****************************************************************************/
-FAR struct mqueue_inode_s *nxmq_alloc_msgq(FAR struct mq_attr *attr)
+FAR struct mqueue_inode_s *nxmq_alloc_msgq(mode_t mode,
+ FAR struct mq_attr *attr)
{
FAR struct mqueue_inode_s *msgq;