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

opendir: use inode_find() instead when opendir() 

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-01-26 20:24:49 +08:00 committed by Xiang Xiao
parent dc93c309b5
commit b0e0f9db68
1 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
fs/dirent/fs_opendir.c
View File

@ -74,28 +74,11 @@ static inline int open_mountpoint(FAR struct inode *inode,
return -ENOSYS;
}
/* Take reference to the mountpoint inode. Note that we do not use
* inode_addref() because we already hold the tree semaphore.
*/
inode->i_crefs++;
/* Perform the opendir() operation */
ret = inode->u.i_mops->opendir(inode, relpath, dir);
if (ret < 0)
{
/* We now need to back off our reference to the inode. We can't
* call inode_release() to do that unless we release the tree
* semaphore. The following should be safe because: (1) after the
* reference count was incremented above it should be >=1 so it should
* not decrement below zero, and (2) we hold the tree semaphore so no
* other thread should be able to change the reference count.
*/
inode->i_crefs--;
DEBUGASSERT(inode->i_crefs >= 0);
/* Negate the error value so that it can be used to set errno */
return ret;
@ -126,11 +109,10 @@ static void open_pseudodir(FAR struct inode *inode,
{
/* 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;
inode_addref(inode);
dir->fd_root = inode; /* Save the inode where we start */
dir->u.pseudo.fd_next = inode; /* This is the next node to use for readdir() */
@ -224,33 +206,20 @@ FAR DIR *opendir(FAR const char *path)
SETUP_SEARCH(&desc, path, false);
ret = inode_semtake();
ret = inode_find(&desc);
if (ret < 0)
{
goto errout;
goto errout_with_search;
}
/* Find the node matching the path. */
/* Get the search results */
ret = inode_search(&desc);
if (ret >= 0)
{
inode = desc.node;
DEBUGASSERT(inode != NULL);
#ifndef CONFIG_DISABLE_MOUNTPOINT
relpath = desc.relpath;
#endif
}
/* Did we get an inode? */
if (inode == NULL)
{
/* Inode for 'path' does not exist. */
ret = -ENOTDIR;
goto errout_with_semaphore;
}
inode = desc.node;
DEBUGASSERT(inode != NULL);
/* Allocate a type DIR -- which is little more than an inode
* container.
@ -262,7 +231,7 @@ FAR DIR *opendir(FAR const char *path)
/* Insufficient memory to complete the operation. */
ret = -ENOMEM;
goto errout_with_semaphore;
goto errout_with_inode;
}
/* Populate the DIR structure and return it to the caller. The way that
@ -320,7 +289,6 @@ FAR DIR *opendir(FAR const char *path)
}
RELEASE_SEARCH(&desc);
inode_semgive();
return ((FAR DIR *)dir);
/* Nasty goto's make error handling simpler */
@ -328,11 +296,11 @@ FAR DIR *opendir(FAR const char *path)
errout_with_direntry:
kumm_free(dir);
errout_with_semaphore:
RELEASE_SEARCH(&desc);
inode_semgive();
errout_with_inode:
inode_release(inode);
errout:
errout_with_search:
RELEASE_SEARCH(&desc);
set_errno(-ret);
return NULL;
}