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 2022/03/29 19:33:47 UTC
[incubator-nuttx] branch master updated: opendir: use inode_find() instead when opendir()
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
The following commit(s) were added to refs/heads/master by this push:
new b0e0f9d opendir: use inode_find() instead when opendir()
b0e0f9d is described below
commit b0e0f9db68c380ae2a76caddc0c55ca552124004
Author: ligd <li...@xiaomi.com>
AuthorDate: Wed Jan 26 20:24:49 2022 +0800
opendir: use inode_find() instead when opendir()
Signed-off-by: ligd <li...@xiaomi.com>
---
fs/dirent/fs_opendir.c | 58 +++++++++++---------------------------------------
1 file changed, 13 insertions(+), 45 deletions(-)
diff --git a/fs/dirent/fs_opendir.c b/fs/dirent/fs_opendir.c
index 354c490..e41b469 100644
--- a/fs/dirent/fs_opendir.c
+++ b/fs/dirent/fs_opendir.c
@@ -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;
+ 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;
}