From fca1ea81db5a621d2110d5d652b2886af66fdfa3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 5 Aug 2012 17:44:11 +0000 Subject: I learned how to spell PSEUDO git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5010 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 2 +- nuttx/Documentation/NfsHowto.html | 776 ++++++++++++++--------------- nuttx/Documentation/NuttShell.html | 6 +- nuttx/TODO | 4 +- nuttx/configs/lincoln60/README.txt | 2 +- nuttx/configs/lpc4330-xplorer/README.txt | 2 +- nuttx/configs/mbed/README.txt | 2 +- nuttx/configs/olimex-lpc1766stk/README.txt | 2 +- nuttx/fs/fs_closedir.c | 8 +- nuttx/fs/fs_files.c | 2 +- nuttx/fs/fs_foreachinode.c | 2 +- nuttx/fs/fs_foreachmountpoint.c | 2 +- nuttx/fs/fs_internal.h | 8 +- nuttx/fs/fs_opendir.c | 16 +- nuttx/fs/fs_readdir.c | 30 +- nuttx/fs/fs_rewinddir.c | 12 +- nuttx/fs/fs_seekdir.c | 14 +- nuttx/fs/fs_stat.c | 10 +- nuttx/fs/fs_statfs.c | 8 +- nuttx/fs/fs_syslog.c | 2 +- nuttx/fs/fs_unregisterblockdriver.c | 2 +- nuttx/fs/fs_unregisterdriver.c | 2 +- nuttx/include/nuttx/fs/dirent.h | 10 +- nuttx/include/nuttx/fs/fs.h | 8 +- 24 files changed, 466 insertions(+), 466 deletions(-) (limited to 'nuttx') diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1061f39ae..6fd497943 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3119,7 +3119,7 @@ function called stm32_clockenable() that can be used by PM logic to re-start the PLL after re-awakening from deep sleep modes. * fs/fs_foreachinode.c and fs/fs_foreachmountpoint.c: All logic to traverse - inodes and mountpoints in the NuttX psuedo-file system. + inodes and mountpoints in the NuttX pseudo-file system. * fs/fat/fs_fat32.c: Max. filename length reported by statfs() was wrong if FAT long file names were enabled. * lib/stdio/lib_libvsprintf.c: Fieldwidth and justification were not diff --git a/nuttx/Documentation/NfsHowto.html b/nuttx/Documentation/NfsHowto.html index 0f08f4abe..0fee8baf7 100644 --- a/nuttx/Documentation/NfsHowto.html +++ b/nuttx/Documentation/NfsHowto.html @@ -1,388 +1,388 @@ - - -NFS Client How-To - - -
- - - - - -
-

NFS Client How-To

-

Last Updated: June 18, 2012

-
-
- - - - - -
-

Table of Contents

-
- -
- - - -
- - - - - -
- Adding NFS to the NuttX Configuration -
- - - - - -
- Mount Interface -
- - - - - -
- NFS Mount Command -
- - - - - -
- Configuring the NFS server (Ubuntu) -
-
- - - - - -
-

Adding NFS to the NuttX Configuration

 -
- -

- The NFS client is easily added to your configuration: - You simply need to add CONFIG_NFS to your nuttx/.config file. - There are, however, a few dependencies on other system settings: -

-
    -
  1. - First, there are number of things that you must configure in order to be able to use any file system: -
    2. - -
  2. - And there are several dependencies on the networking configuration. - At a minimum, you need to have the following selections: -
    3. - -
- - - - - -
-

Mount Interface

 -
- -

- A low-level, C-callable interface is provided to mount a file system. - That interface is called mount() and is mentioned in the porting guide and is prototyped in the header file include/sys/mount.h: -

- -

- Synopsis: - mount() attaches the filesystem specified by the source block device name into the root file system at the path specified by target. -

-

- Input Paramters: -

-

-

- Returned Values - Zero is returned on success; -1 is returned on an error and errno is set appropriately: -

-

-

- This same interface can be used to mount a remote, NFS file system using some special parameters. - The NFS mount differs from the normal file system mount in that: (1) there is no block driver for the NFS file system, and (2) special parameters must be passed as data to describe the remote NFS server. - Thus the following code snippet might represent how an NFS file system is mounted: -

- -

- NOTE that: (1) the block driver paramter is NULL. - The mount() is smart enough to know that no block driver is needed with the NFS file system. - (2) The NFS file system is identified with the simple string "nfs" - (3) A reference to struct nfs_args is passed as an NFS-specific argument. -

-

- The NFS-specific interface is described in the file include/nuttx/fs/nfs.h. - There you can see that struct nfs_args is defined as: -

- - - - - - -
-

NFS Mount Command

 -
- -

- The NuttShell (NSH) also supports a command called nfsmount - that can be used to mount a remote file system via the NSH command line. -

-

- Command Syntax: -

- -

- Synopsis. - The nfsmount command mounts a network file system in the NuttX psuedo filesystem. - The nfsmount will use NFSv3 UDP protocol to mount the remote file system. -

-

- Command Line Arguments. - The nfsmount takes three arguments: -

-
    -
  1. - The <server-address> is the IP address of the server exporting the file system you wish to mount. - This implementation of NFS for the NuttX RTOS is only for a local area network, so the server and client must be in the same network. -
    2. -
  2. - The <mount-point > is the location in the NuttX pseudo filesystem where the mounted volume will appear. - This mount point can only reside in the NuttX pseudo filesystem. - By convention, this mount point is a subdirectory under /mnt. - The mount command will create whatever psuedo directories that may be needed to complete the full path (but the full path must not already exist). -
    3. -
  3. - The <remote-path> is the file system / directory being exported from server. - This / directory must have been configured for exportation on the server before when the NFS server was set up. -
    4. -
- -

- After the volume has been mounted in the NuttX pseudo filesystem, it may be access in the same way as other objects in the file system. -

-

- Example. - Suppose the the NFS server has been configured to export the directory /export/shared. - The the following command would mount that file system (assuming that the target also has privileges to mount the file system). -

- - - - - - -
-

Configuring the NFS server (Ubuntu)

 -
- -

- Setting up the server will be done in two steps: - First, setting up the configuration file for NFS, and then starting the NFS services. - But first, you need to install the nfs server on Ubuntu with the these two commands: -

- - -

- After that, we need to make or choose the directory we want to export from the NFS server. - In our case, we are going to make a new directory called /export. -

- -

- It is important that /export directory allow access to everyone (777 permissions) as we will be accessing the NFS share from the client with no authentication. -

- -

- When all this is done, we will need to edit the configuration file to set up an NFS server: /etc/exports. - This file contains a list of entries; - each entry indicates a volume that is shared and how it is shared. - For more information for a complete description of all the setup options for this file you can check in the man pages (man export).

- An entry in /etc/exports will typically look like this: -

- -

- So for our example we export /export to the client 10.0.0.2 add the entry: -

- -

- In our case we are using all the default options except for the ro that we replaced with rw so that our client will have read and write access to the directory that we are exporting. -

-

- After we do all the require configurations, we are ready to start the server with the next command: -

- -

- Note: If you later decide to add more NFS exports to the /etc/exports file, you will need to either restart NFS daemon -or run command exportfs. -

- -

Or

- -

- Now we can check if the export directory and our mount point is properly set up. -

- -

- And also we can verify if NFS is running in the system with: -

-

-

-

- Now your NFS sever is sharing /export directory to be accessed. -

- - - + + +NFS Client How-To + + +
+ + + + + +
+

NFS Client How-To

+

Last Updated: June 18, 2012

+
+
+ + + + + +
+

Table of Contents

+
+ +
+ + + +
+ + + + + +
+ Adding NFS to the NuttX Configuration +
+ + + + + +
+ Mount Interface +
+ + + + + +
+ NFS Mount Command +
+ + + + + +
+ Configuring the NFS server (Ubuntu) +
+
+ + + + + +
+

Adding NFS to the NuttX Configuration

 +
+ +

+ The NFS client is easily added to your configuration: + You simply need to add CONFIG_NFS to your nuttx/.config file. + There are, however, a few dependencies on other system settings: +

+
    +
  1. + First, there are number of things that you must configure in order to be able to use any file system: +
    2. + +
  2. + And there are several dependencies on the networking configuration. + At a minimum, you need to have the following selections: +
    3. + +
+ + + + + +
+

Mount Interface

 +
+ +

+ A low-level, C-callable interface is provided to mount a file system. + That interface is called mount() and is mentioned in the porting guide and is prototyped in the header file include/sys/mount.h: +

+ +

+ Synopsis: + mount() attaches the filesystem specified by the source block device name into the root file system at the path specified by target. +

+

+ Input Paramters: +

+

+

+ Returned Values + Zero is returned on success; -1 is returned on an error and errno is set appropriately: +

+

+

+ This same interface can be used to mount a remote, NFS file system using some special parameters. + The NFS mount differs from the normal file system mount in that: (1) there is no block driver for the NFS file system, and (2) special parameters must be passed as data to describe the remote NFS server. + Thus the following code snippet might represent how an NFS file system is mounted: +

+ +

+ NOTE that: (1) the block driver paramter is NULL. + The mount() is smart enough to know that no block driver is needed with the NFS file system. + (2) The NFS file system is identified with the simple string "nfs" + (3) A reference to struct nfs_args is passed as an NFS-specific argument. +

+

+ The NFS-specific interface is described in the file include/nuttx/fs/nfs.h. + There you can see that struct nfs_args is defined as: +

+ + + + + + +
+

NFS Mount Command

 +
+ +

+ The NuttShell (NSH) also supports a command called nfsmount + that can be used to mount a remote file system via the NSH command line. +

+

+ Command Syntax: +

+ +

+ Synopsis. + The nfsmount command mounts a network file system in the NuttX pseudo filesystem. + The nfsmount will use NFSv3 UDP protocol to mount the remote file system. +

+

+ Command Line Arguments. + The nfsmount takes three arguments: +

+
    +
  1. + The <server-address> is the IP address of the server exporting the file system you wish to mount. + This implementation of NFS for the NuttX RTOS is only for a local area network, so the server and client must be in the same network. +
    2. +
  2. + The <mount-point > is the location in the NuttX pseudo filesystem where the mounted volume will appear. + This mount point can only reside in the NuttX pseudo filesystem. + By convention, this mount point is a subdirectory under /mnt. + The mount command will create whatever pseudo directories that may be needed to complete the full path (but the full path must not already exist). +
    3. +
  3. + The <remote-path> is the file system / directory being exported from server. + This / directory must have been configured for exportation on the server before when the NFS server was set up. +
    4. +
+ +

+ After the volume has been mounted in the NuttX pseudo filesystem, it may be access in the same way as other objects in the file system. +

+

+ Example. + Suppose the the NFS server has been configured to export the directory /export/shared. + The the following command would mount that file system (assuming that the target also has privileges to mount the file system). +

+ + + + + + +
+

Configuring the NFS server (Ubuntu)

 +
+ +

+ Setting up the server will be done in two steps: + First, setting up the configuration file for NFS, and then starting the NFS services. + But first, you need to install the nfs server on Ubuntu with the these two commands: +

+ + +

+ After that, we need to make or choose the directory we want to export from the NFS server. + In our case, we are going to make a new directory called /export. +

+ +

+ It is important that /export directory allow access to everyone (777 permissions) as we will be accessing the NFS share from the client with no authentication. +

+ +

+ When all this is done, we will need to edit the configuration file to set up an NFS server: /etc/exports. + This file contains a list of entries; + each entry indicates a volume that is shared and how it is shared. + For more information for a complete description of all the setup options for this file you can check in the man pages (man export).

+ An entry in /etc/exports will typically look like this: +

+ +

+ So for our example we export /export to the client 10.0.0.2 add the entry: +

+ +

+ In our case we are using all the default options except for the ro that we replaced with rw so that our client will have read and write access to the directory that we are exporting. +

+

+ After we do all the require configurations, we are ready to start the server with the next command: +

+ +

+ Note: If you later decide to add more NFS exports to the /etc/exports file, you will need to either restart NFS daemon +or run command exportfs. +

+ +

Or

+ +

+ Now we can check if the export directory and our mount point is properly set up. +

+ +

+ And also we can verify if NFS is running in the system with: +

+

+

+

+ Now your NFS sever is sharing /export directory to be accessed. +

+ + + diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index 8e57e27b2..0413a4695 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -1400,7 +1400,7 @@ mkfifo <path>

Synopsis. Creates a FIFO character device anywhere in the pseudo file system, creating - whatever psuedo directories that may be needed to complete the <path>. + whatever pseudo directories that may be needed to complete the <path>. By convention, however, device drivers are place in the standard /dev directory. After it is created, the FIFO device may be used as any other device driver. NSH provides this command to access the mkfifo() NuttX API. @@ -1492,7 +1492,7 @@ mount -t <fstype> <block-device> <dir-path> If no paramters are provided on the command line after the mount command, then the mount command will enumerate all of the current mountpoints on the console.

- If the mount parameters are provied on the command after the mount command, then the mount command will mount a file system in the NuttX psuedo-file system. + If the mount parameters are provied on the command after the mount command, then the mount command will mount a file system in the NuttX pseudo-file system. mount' performs a three way association, binding:

    @@ -1513,7 +1513,7 @@ mount -t <fstype> <block-device> <dir-path> pseudo filesystem where the mounted volume will appear. This mount point can only reside in the NuttX pseudo filesystem. By convention, this mount point is a subdirectory under /mnt. - The mount command will create whatever psuedo directories that may be needed to complete the + The mount command will create whatever pseudo directories that may be needed to complete the full path but the full path must not already exist.
diff --git a/nuttx/TODO b/nuttx/TODO index a4bad193e..e2abce7f4 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -703,9 +703,9 @@ o File system / Generic drivers (fs/, drivers/) Title: REMOVING PIPES AND FIFOS Description: There is no way to remove a FIFO or PIPE created in the - psuedo filesystem. Once created, they persist indefinitely + pseudo filesystem. Once created, they persist indefinitely and cannot be unlinked. This is actually a more generic - issue: unlink does not work for anything in the psuedo- + issue: unlink does not work for anything in the pseudo- filesystem. Status: Open, but partially resolved: pipe buffer is at least freed when there are not open references to the pipe/FIFO. diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt index 7a06a852b..6ad37d363 100644 --- a/nuttx/configs/lincoln60/README.txt +++ b/nuttx/configs/lincoln60/README.txt @@ -413,7 +413,7 @@ host operations. To make these modifications, do the following: When this change is made, NSH should be extended to support USB flash devices. When a FLASH device is inserted, you should see a device -appear in the /dev (psuedo) directory. The device name should be +appear in the /dev (pseudo) directory. The device name should be like /dev/sda, /dev/sdb, etc. The USB mass storage device, is present it can be mounted from the NSH command line like: diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt index a5c0709ea..4ebe89d9e 100644 --- a/nuttx/configs/lpc4330-xplorer/README.txt +++ b/nuttx/configs/lpc4330-xplorer/README.txt @@ -829,7 +829,7 @@ host operations. To make these modifications, do the following: When this change is made, NSH should be extended to support USB flash devices. When a FLASH device is inserted, you should see a device -appear in the /dev (psuedo) directory. The device name should be +appear in the /dev (pseudo) directory. The device name should be like /dev/sda, /dev/sdb, etc. The USB mass storage device, is present it can be mounted from the NSH command line like: diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt index 3366ed320..0b98d9085 100755 --- a/nuttx/configs/mbed/README.txt +++ b/nuttx/configs/mbed/README.txt @@ -384,7 +384,7 @@ host operations. To make these modifications, do the following: When this change is made, NSH should be extended to support USB flash devices. When a FLASH device is inserted, you should see a device -appear in the /dev (psuedo) directory. The device name should be +appear in the /dev (pseudo) directory. The device name should be like /dev/sda, /dev/sdb, etc. The USB mass storage device, is present it can be mounted from the NSH command line like: diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt index b2a1ad5fa..b81826e30 100755 --- a/nuttx/configs/olimex-lpc1766stk/README.txt +++ b/nuttx/configs/olimex-lpc1766stk/README.txt @@ -788,7 +788,7 @@ USB host operations. To make these modifications, do the following: When this change is made, NSH should be extended to support USB flash devices. When a FLASH device is inserted, you should see a device -appear in the /dev (psuedo) directory. The device name should be +appear in the /dev (pseudo) directory. The device name should be like /dev/sda, /dev/sdb, etc. The USB mass storage device, is present it can be mounted from the NSH command line like: diff --git a/nuttx/fs/fs_closedir.c b/nuttx/fs/fs_closedir.c index fe0994478..ba4f12961 100644 --- a/nuttx/fs/fs_closedir.c +++ b/nuttx/fs/fs_closedir.c @@ -96,7 +96,7 @@ int closedir(FAR DIR *dirp) */ #ifndef CONFIG_DISABLE_MOUNTPOINT - if (INODE_IS_MOUNTPT(inode) && !DIRENT_ISPSUEDONODE(idir->fd_flags)) + if (INODE_IS_MOUNTPT(inode) && !DIRENT_ISPSEUDONODE(idir->fd_flags)) { /* The node is a file system mointpoint. Verify that the mountpoint * supports the closedir() method (not an error if it does not) @@ -117,13 +117,13 @@ int closedir(FAR DIR *dirp) else #endif { - /* The node is part of the root psuedo file system, release + /* The node is part of the root pseudo file system, release * our contained reference to the 'next' inode. */ - if (idir->u.psuedo.fd_next) + if (idir->u.pseudo.fd_next) { - inode_release(idir->u.psuedo.fd_next); + inode_release(idir->u.pseudo.fd_next); } } diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c index 033cd8c63..425e7c73f 100644 --- a/nuttx/fs/fs_files.c +++ b/nuttx/fs/fs_files.c @@ -342,7 +342,7 @@ int files_dup(FAR struct file *filep1, FAR struct file *filep2) #endif #endif { - /* Open the psuedo file or device driver */ + /* Open the pseudo file or device driver */ ret = inode->u.i_ops->open(filep2); } diff --git a/nuttx/fs/fs_foreachinode.c b/nuttx/fs/fs_foreachinode.c index 08630263b..c5874c669 100644 --- a/nuttx/fs/fs_foreachinode.c +++ b/nuttx/fs/fs_foreachinode.c @@ -171,7 +171,7 @@ int foreach_inodelevel(FAR struct inode *node, struct inode_path_s *info) * when the callback 'handler' returns a non-zero value, or when all of * the inodes have been visited. * - * NOTE 1: Use with caution... The psuedo-file system is locked throughout + * NOTE 1: Use with caution... The pseudo-file system is locked throughout * the traversal. * NOTE 2: The search algorithm is recursive and could, in principle, use * an indeterminant amount of stack space. This will not usually be a diff --git a/nuttx/fs/fs_foreachmountpoint.c b/nuttx/fs/fs_foreachmountpoint.c index e7a620650..74e3e8356 100644 --- a/nuttx/fs/fs_foreachmountpoint.c +++ b/nuttx/fs/fs_foreachmountpoint.c @@ -154,7 +154,7 @@ static int mountpoint_filter(FAR struct inode *node, * mountpoint inodes. It is intended to support the mount() command to * when the mount command is used to enumerate mounts. * - * NOTE 1: Use with caution... The psuedo-file system is locked throughout + * NOTE 1: Use with caution... The pseudo-file system is locked throughout * the traversal. * NOTE 2: The search algorithm is recursive and could, in principle, use * an indeterminant amount of stack space. This will not usually be a diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h index dbabb63d1..786c683dc 100644 --- a/nuttx/fs/fs_internal.h +++ b/nuttx/fs/fs_internal.h @@ -75,10 +75,10 @@ /* Mountpoint fd_flags values */ -#define DIRENTFLAGS_PSUEDONODE 1 +#define DIRENTFLAGS_PSEUDONODE 1 -#define DIRENT_SETPSUEDONODE(f) do (f) |= DIRENTFLAGS_PSUEDONODE; while (0) -#define DIRENT_ISPSUEDONODE(f) (((f) & DIRENTFLAGS_PSUEDONODE) != 0) +#define DIRENT_SETPSEUDONODE(f) do (f) |= DIRENTFLAGS_PSEUDONODE; while (0) +#define DIRENT_ISPSEUDONODE(f) (((f) & DIRENTFLAGS_PSEUDONODE) != 0) /**************************************************************************** * Public Types @@ -236,7 +236,7 @@ EXTERN void inode_release(FAR struct inode *inode); * when the callback 'handler' returns a non-zero value, or when all of * the inodes have been visited. * - * NOTE 1: Use with caution... The psuedo-file system is locked throughout + * NOTE 1: Use with caution... The pseudo-file system is locked throughout * the traversal. * NOTE 2: The search algorithm is recursive and could, in principle, use * an indeterminant amount of stack space. This will not usually be a diff --git a/nuttx/fs/fs_opendir.c b/nuttx/fs/fs_opendir.c index a52c538fe..1c87c984d 100644 --- a/nuttx/fs/fs_opendir.c +++ b/nuttx/fs/fs_opendir.c @@ -138,19 +138,19 @@ static inline int open_mountpoint(FAR struct inode *inode, static void open_pseudodir(FAR struct inode *inode, FAR struct fs_dirent_s *dir) { - /* We have a valid psuedo-filesystem node. Take two references on the + /* We have a valid pseudo-filesystem node. Take two references on the * inode -- one for the parent (fd_root) and one for the child (fd_next). * Note that we do not call inode_addref because we are holding the tree * semaphore and that would result in deadlock. */ inode->i_crefs += 2; - dir->u.psuedo.fd_next = inode; /* This is the next node to use for readdir() */ + dir->u.pseudo.fd_next = inode; /* This is the next node to use for readdir() */ - /* Flag the inode as belonging to the psuedo-filesystem */ + /* Flag the inode as belonging to the pseudo-filesystem */ #ifndef CONFIG_DISABLE_MOUNTPOINT - DIRENT_SETPSUEDONODE(dir->fd_flags); + DIRENT_SETPSEUDONODE(dir->fd_flags); #endif } @@ -242,7 +242,7 @@ FAR DIR *opendir(FAR const char *path) } /* Populate the DIR structure and return it to the caller. The way that - * we do this depends on whenever this is a "normal" psuedo-file-system + * we do this depends on whenever this is a "normal" pseudo-file-system * inode or a file system mountpoint. */ @@ -262,7 +262,7 @@ FAR DIR *opendir(FAR const char *path) open_pseudodir(inode, dir); } - /* Is this a node in the psuedo filesystem? Or a mountpoint? If the node + /* Is this a node in the pseudo filesystem? Or a mountpoint? If the node * is the root (bisroot == TRUE), then this is a special case. */ @@ -280,7 +280,7 @@ FAR DIR *opendir(FAR const char *path) #endif else { - /* The node is part of the root psuedo file system. Does the inode have a child? + /* The node is part of the root pseudo file system. Does the inode have a child? * If so that the child would be the 'root' of a list of nodes under * the directory. */ @@ -292,7 +292,7 @@ FAR DIR *opendir(FAR const char *path) goto errout_with_direntry; } - /* It looks we have a valid psuedo-filesystem directory node. */ + /* It looks we have a valid pseudo-filesystem directory node. */ open_pseudodir(inode, dir); } diff --git a/nuttx/fs/fs_readdir.c b/nuttx/fs/fs_readdir.c index 8df1bf655..f5b266392 100644 --- a/nuttx/fs/fs_readdir.c +++ b/nuttx/fs/fs_readdir.c @@ -53,16 +53,16 @@ ****************************************************************************/ /**************************************************************************** - * Name: readpsuedodir + * Name: readpseudodir ****************************************************************************/ -static inline int readpsuedodir(struct fs_dirent_s *idir) +static inline int readpseudodir(struct fs_dirent_s *idir) { FAR struct inode *prev; /* Check if we are at the end of the list */ - if (!idir->u.psuedo.fd_next) + if (!idir->u.pseudo.fd_next) { /* End of file and error conditions are not distinguishable * with readdir. Here we return -ENOENT to signal the end @@ -74,21 +74,21 @@ static inline int readpsuedodir(struct fs_dirent_s *idir) /* Copy the inode name into the dirent structure */ - strncpy(idir->fd_dir.d_name, idir->u.psuedo.fd_next->i_name, NAME_MAX+1); + strncpy(idir->fd_dir.d_name, idir->u.pseudo.fd_next->i_name, NAME_MAX+1); /* If the node has file operations, we will say that it is * a file. */ idir->fd_dir.d_type = 0; - if (idir->u.psuedo.fd_next->u.i_ops) + if (idir->u.pseudo.fd_next->u.i_ops) { #ifndef CONFIG_DISABLE_MOUNTPOINT - if (INODE_IS_BLOCK(idir->u.psuedo.fd_next)) + if (INODE_IS_BLOCK(idir->u.pseudo.fd_next)) { idir->fd_dir.d_type |= DTYPE_BLK; } - if (INODE_IS_MOUNTPT(idir->u.psuedo.fd_next)) + if (INODE_IS_MOUNTPT(idir->u.pseudo.fd_next)) { idir->fd_dir.d_type |= DTYPE_DIRECTORY; } @@ -103,7 +103,7 @@ static inline int readpsuedodir(struct fs_dirent_s *idir) * is a directory. NOTE: that the node can be both! */ - if (idir->u.psuedo.fd_next->i_child || !idir->u.psuedo.fd_next->u.i_ops) + if (idir->u.pseudo.fd_next->i_child || !idir->u.pseudo.fd_next->u.i_ops) { idir->fd_dir.d_type |= DTYPE_DIRECTORY; } @@ -112,14 +112,14 @@ static inline int readpsuedodir(struct fs_dirent_s *idir) inode_semtake(); - prev = idir->u.psuedo.fd_next; - idir->u.psuedo.fd_next = prev->i_peer; /* The next node to visit */ + prev = idir->u.pseudo.fd_next; + idir->u.pseudo.fd_next = prev->i_peer; /* The next node to visit */ - if (idir->u.psuedo.fd_next) + if (idir->u.pseudo.fd_next) { /* Increment the reference count on this next node */ - idir->u.psuedo.fd_next->i_crefs++; + idir->u.pseudo.fd_next->i_crefs++; } inode_semgive(); @@ -179,7 +179,7 @@ FAR struct dirent *readdir(DIR *dirp) #ifndef CONFIG_DISABLE_MOUNTPOINT inode = idir->fd_root; - if (INODE_IS_MOUNTPT(inode) && !DIRENT_ISPSUEDONODE(idir->fd_flags)) + if (INODE_IS_MOUNTPT(inode) && !DIRENT_ISPSEUDONODE(idir->fd_flags)) { /* The node is a file system mointpoint. Verify that the mountpoint * supports the readdir() method @@ -198,9 +198,9 @@ FAR struct dirent *readdir(DIR *dirp) else #endif { - /* The node is part of the root psuedo file system */ + /* The node is part of the root pseudo file system */ - ret = readpsuedodir(idir); + ret = readpseudodir(idir); } /* ret < 0 is an error. Special case: ret = -ENOENT is end of file */ diff --git a/nuttx/fs/fs_rewinddir.c b/nuttx/fs/fs_rewinddir.c index a0e2be7d8..c22c15f18 100644 --- a/nuttx/fs/fs_rewinddir.c +++ b/nuttx/fs/fs_rewinddir.c @@ -52,10 +52,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: rewindpsuedodir + * Name: rewindpseudodir ****************************************************************************/ -static inline void rewindpsuedodir(struct fs_dirent_s *idir) +static inline void rewindpseudodir(struct fs_dirent_s *idir) { struct inode *prev; @@ -63,8 +63,8 @@ static inline void rewindpsuedodir(struct fs_dirent_s *idir) /* Reset the position to the beginning */ - prev = idir->u.psuedo.fd_next; /* (Save to delete later) */ - idir->u.psuedo.fd_next = idir->fd_root; /* The next node to visit */ + prev = idir->u.pseudo.fd_next; /* (Save to delete later) */ + idir->u.pseudo.fd_next = idir->fd_root; /* The next node to visit */ idir->fd_position = 0; /* Reset position */ /* Increment the reference count on the root=next node. We @@ -138,8 +138,8 @@ void rewinddir(FAR DIR *dirp) else #endif { - /* The node is part of the root psuedo file system */ + /* The node is part of the root pseudo file system */ - rewindpsuedodir(idir); + rewindpseudodir(idir); } } diff --git a/nuttx/fs/fs_seekdir.c b/nuttx/fs/fs_seekdir.c index ec530c67d..781d35f27 100644 --- a/nuttx/fs/fs_seekdir.c +++ b/nuttx/fs/fs_seekdir.c @@ -53,10 +53,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: seekpsuedodir + * Name: seekpseudodir ****************************************************************************/ -static inline void seekpsuedodir(struct fs_dirent_s *idir, off_t offset) +static inline void seekpseudodir(struct fs_dirent_s *idir, off_t offset) { struct inode *curr; struct inode *prev; @@ -76,7 +76,7 @@ static inline void seekpsuedodir(struct fs_dirent_s *idir, off_t offset) else { pos = idir->fd_position; - curr = idir->u.psuedo.fd_next; + curr = idir->u.pseudo.fd_next; } /* Traverse the peer list starting at the 'root' of the @@ -90,8 +90,8 @@ static inline void seekpsuedodir(struct fs_dirent_s *idir, off_t offset) /* Now get the inode to vist next time that readdir() is called */ - prev = idir->u.psuedo.fd_next; - idir->u.psuedo.fd_next = curr; /* The next node to visit (might be null) */ + prev = idir->u.pseudo.fd_next; + idir->u.pseudo.fd_next = curr; /* The next node to visit (might be null) */ idir->fd_position = pos; /* Might be beyond the last dirent */ if (curr) @@ -223,8 +223,8 @@ void seekdir(FAR DIR *dirp, off_t offset) else #endif { - /* The node is part of the root psuedo file system */ + /* The node is part of the root pseudo file system */ - seekpsuedodir(idir, offset); + seekpseudodir(idir, offset); } } diff --git a/nuttx/fs/fs_stat.c b/nuttx/fs/fs_stat.c index 5cb342081..cf27e87a6 100644 --- a/nuttx/fs/fs_stat.c +++ b/nuttx/fs/fs_stat.c @@ -51,10 +51,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: statpsuedo + * Name: statpseudo ****************************************************************************/ -static inline int statpsuedo(FAR struct inode *inode, FAR struct stat *buf) +static inline int statpseudo(FAR struct inode *inode, FAR struct stat *buf) { /* Most of the stat entries just do not apply */ @@ -92,7 +92,7 @@ static inline int statpsuedo(FAR struct inode *inode, FAR struct stat *buf) { /* If it has no operations, then it must just be a intermediate * node in the inode tree. It is something like a directory. - * We'll say that all psuedo-directories are read-able but not + * We'll say that all pseudo-directories are read-able but not * write-able. */ @@ -195,9 +195,9 @@ int stat(const char *path, FAR struct stat *buf) else #endif { - /* The node is part of the root psuedo file system */ + /* The node is part of the root pseudo file system */ - ret = statpsuedo(inode, buf); + ret = statpseudo(inode, buf); } /* Check if the stat operation was successful */ diff --git a/nuttx/fs/fs_statfs.c b/nuttx/fs/fs_statfs.c index 540eb86bb..df7321bbd 100644 --- a/nuttx/fs/fs_statfs.c +++ b/nuttx/fs/fs_statfs.c @@ -52,10 +52,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: statpsuedo + * Name: statpseudo ****************************************************************************/ -static inline int statpsuedofs(FAR struct inode *inode, FAR struct statfs *buf) +static inline int statpseudofs(FAR struct inode *inode, FAR struct statfs *buf) { memset(buf, 0, sizeof(struct statfs)); buf->f_type = PROC_SUPER_MAGIC; @@ -137,9 +137,9 @@ int statfs(FAR const char *path, FAR struct statfs *buf) else #endif { - /* The node is part of the root psuedo file system */ + /* The node is part of the root pseudo file system */ - ret = statpsuedofs(inode, buf); + ret = statpseudofs(inode, buf); } /* Check if the statfs operation was successful */ diff --git a/nuttx/fs/fs_syslog.c b/nuttx/fs/fs_syslog.c index 1fe8c03a1..1d569082a 100644 --- a/nuttx/fs/fs_syslog.c +++ b/nuttx/fs/fs_syslog.c @@ -319,7 +319,7 @@ int syslog_initialize(void) SYSLOG_OFLAGS, 0666); } - /* No... then it must be a character driver in the NuttX psuedo- + /* No... then it must be a character driver in the NuttX pseudo- * file system. */ diff --git a/nuttx/fs/fs_unregisterblockdriver.c b/nuttx/fs/fs_unregisterblockdriver.c index 4ee9016fc..4d169fddf 100644 --- a/nuttx/fs/fs_unregisterblockdriver.c +++ b/nuttx/fs/fs_unregisterblockdriver.c @@ -71,7 +71,7 @@ * Name: unregister_blockdriver * * Description: - * Remove the block driver inode at 'path' from the psuedo-file system + * Remove the block driver inode at 'path' from the pseudo-file system * ****************************************************************************/ diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/fs_unregisterdriver.c index 7537274b5..c9ac0b619 100644 --- a/nuttx/fs/fs_unregisterdriver.c +++ b/nuttx/fs/fs_unregisterdriver.c @@ -71,7 +71,7 @@ * Name: unregister_driver * * Description: - * Remove the character driver inode at 'path' from the psuedo-file system + * Remove the character driver inode at 'path' from the pseudo-file system * ****************************************************************************/ diff --git a/nuttx/include/nuttx/fs/dirent.h b/nuttx/include/nuttx/fs/dirent.h index 8aad4242b..75867c87a 100644 --- a/nuttx/include/nuttx/fs/dirent.h +++ b/nuttx/include/nuttx/fs/dirent.h @@ -65,12 +65,12 @@ * reference, a position, a dirent structure, and file-system-specific * information. * - * For the root psuedo-file system, we need retain only the 'next' inode + * For the root pseudo-file system, we need retain only the 'next' inode * need for the next readdir() operation. We hold a reference on this * inode so we know that it will persist until closedir is called. */ -struct fs_psuedodir_s +struct fs_pseudodir_s { struct inode *fd_next; /* The inode for the next call to readdir() */ }; @@ -140,7 +140,7 @@ struct fs_dirent_s { /* This is the node that was opened by opendir. The type of the inode * determines the way that the readdir() operations are performed. For the - * psuedo root psuedo-file system, it is also used to support rewind. + * pseudo root pseudo-file system, it is also used to support rewind. * * We hold a reference on this inode so we know that it will persist until * closedir() is called (although inodes linked to this inode may change). @@ -166,9 +166,9 @@ struct fs_dirent_s union { - /* Private data used by the built-in psuedo-file system */ + /* Private data used by the built-in pseudo-file system */ - struct fs_psuedodir_s psuedo; + struct fs_pseudodir_s pseudo; /* Private data used by other file systems */ diff --git a/nuttx/include/nuttx/fs/fs.h b/nuttx/include/nuttx/fs/fs.h index 07d28597e..81f81622f 100644 --- a/nuttx/include/nuttx/fs/fs.h +++ b/nuttx/include/nuttx/fs/fs.h @@ -199,7 +199,7 @@ union inode_ops_u #endif }; -/* This structure represents one inode in the Nuttx psuedo-file system */ +/* This structure represents one inode in the Nuttx pseudo-file system */ struct inode { @@ -342,7 +342,7 @@ EXTERN void weak_function fs_initialize(void); * mountpoint inodes. It is intended to support the mount() command to * when the mount command is used to enumerate mounts. * - * NOTE 1: Use with caution... The psuedo-file system is locked throughout + * NOTE 1: Use with caution... The pseudo-file system is locked throughout * the traversal. * NOTE 2: The search algorithm is recursive and could, in principle, use * an indeterminant amount of stack space. This will not usually be a @@ -415,7 +415,7 @@ EXTERN int register_blockdriver(const char *path, * Name: unregister_driver * * Description: - * Remove the character driver inode at 'path' from the psuedo-file system + * Remove the character driver inode at 'path' from the pseudo-file system * ****************************************************************************/ @@ -426,7 +426,7 @@ EXTERN int unregister_driver(const char *path); * Name: unregister_blockdriver * * Description: - * Remove the block driver inode at 'path' from the psuedo-file system + * Remove the block driver inode at 'path' from the pseudo-file system * ****************************************************************************/ -- cgit v1.2.3