fs: Remove file_detach since it is unefficient to call open and file_…

…detach the kernel user should call file_open directly instead Signed-off-by: Xiang Xiao <[email protected]> Change-Id: I5bf7f661006f5d43739bc8618abfb4b983fde78d
YunhuaLiu · Jan 11, 2021 · 1604fe0 · 1604fe0
1 parent 0032ddb
commit 1604fe0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 180 deletions.
diff --git a/fs/inode/Make.defs b/fs/inode/Make.defs
@@ -36,7 +36,6 @@
 CSRCS += fs_files.c fs_foreachinode.c fs_inode.c fs_inodeaddref.c
 CSRCS += fs_inodebasename.c fs_inodefind.c fs_inodefree.c fs_inoderelease.c
 CSRCS += fs_inoderemove.c fs_inodereserve.c fs_inodesearch.c
-CSRCS += fs_filedetach.c
 
 # Include inode/utils build support
 

diff --git a/fs/inode/fs_filedetach.c b/fs/inode/fs_filedetach.c
diff --git a/fs/vfs/fs_close.c b/fs/vfs/fs_close.c
@@ -60,12 +60,11 @@
  * Name: file_close
  *
  * Description:
- *   Close a file that was previously opend with file_open() (or detached
- *   with file_detach()).
+ *   Close a file that was previously opened with file_open().
  *
  * Input Parameters:
  *   filep - A pointer to a user provided memory location containing the
- *           open file data returned by file_detach().
+ *           open file data returned by file_open().
  *
  * Returned Value:
  *   Zero (OK) is returned on success; A negated errno value is returned on

diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
@@ -881,42 +881,15 @@ int nx_open(FAR const char *path, int oflags, ...);
 
 int fs_getfilep(int fd, FAR struct file **filep);
 
-/****************************************************************************
- * Name: file_detach
- *
- * Description:
- *   This function is used to device drivers to create a task-independent
- *   handle to an entity in the file system.  file_detach() duplicates the
- *   'struct file' that underlies the file descriptor, then closes the file
- *   descriptor.
- *
- *   This function will fail if fd is not a valid file descriptor.  In
- *   particular, it will fail if fd is a socket descriptor.
- *
- * Input Parameters:
- *   fd    - The file descriptor to be detached.  This descriptor will be
- *           closed and invalid if the file was successfully detached.
- *   filep - A pointer to a user provided memory location in which to
- *           received the duplicated, detached file structure.
- *
- * Returned Value:
- *   Zero (OK) is returned on success; A negated errno value is returned on
- *   any failure to indicate the nature of the failure.
- *
- ****************************************************************************/
-
-int file_detach(int fd, FAR struct file *filep);
-
 /****************************************************************************
  * Name: file_close
  *
  * Description:
- *   Close a file that was previously opened with file_open() (or detached
- *   with file_detach()).
+ *   Close a file that was previously opened with file_open().
  *
  * Input Parameters:
  *   filep - A pointer to a user provided memory location containing the
- *           open file data returned by file_detach().
+ *           open file data returned by file_open().
  *
  * Returned Value:
  *   Zero (OK) is returned on success; A negated errno value is returned on