OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Corrects a bad assertion noted by Pierre-noel Bouteville. Also fixes a reference counting problem in an error condition: When the mountpoint inode is found but is not an appropriate mountpoint, the reference count on the inode was not being decremented.

This commit is contained in:
Gregory Nutt 2016-09-22 08:22:28 -06:00
parent 9fa1024eef
commit 8221c2da64
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/mount/fs_mount.c
View File

@ -283,22 +283,19 @@ int mount(FAR const char *source, FAR const char *target,
mountpt_inode = inode_find(target, NULL);
if (mountpt_inode != NULL)
{
/* Yes... Is is a directory node (i.e., not a driver or other special
* node.
/* Successfully found. The reference count on the inode has been
* incremented.
*
* But is it a directory node (i.e., not a driver or other special
* node).
*/
if (INODE_IS_SPECIAL(mountpt_inode))
{
ferr("ERROR: target %s exists and is a special nodes\n", target);
ferr("ERROR: target %s exists and is a special node\n", target);
errcode = -ENOTDIR;
goto errout_with_semaphore;
goto errout_with_inode;
}
/* Successfully found. The reference count on the inode has been
* incremented.
*/
DEBUGASSERT(mountpt_inode->u.i_mops != NULL);
}
else
#endif
@ -422,6 +419,9 @@ errout_with_mountpt:
}
#endif
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
errout_with_inode:
#endif
inode_release(mountpt_inode);
goto errout;