diff --git a/fs/inode/Make.defs b/fs/inode/Make.defs index 158f30514a7..57fc04800f1 100644 --- a/fs/inode/Make.defs +++ b/fs/inode/Make.defs @@ -40,7 +40,7 @@ ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) 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_fileopen.c fs_filedetach.c +CSRCS += fs_fileopen.c fs_filedetach.c fs_fileclose.c # Include inode/utils build support diff --git a/fs/inode/fs_fileclose.c b/fs/inode/fs_fileclose.c new file mode 100644 index 00000000000..2bb59138d2d --- /dev/null +++ b/fs/inode/fs_fileclose.c @@ -0,0 +1,105 @@ +/**************************************************************************** + * fs/inode/fs_fileclose.c + * + * Copyright (C) 2016-2018 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#include "inode/inode.h" + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: file_close + * + * Description: + * Close a file that was previously opend with file_open() (or detached + * with file_detach()). + * + * REVISIT: This is essentially the same as _files_close() + * + * Input Parameters: + * filep - A pointer to a user provided memory location containing the + * open file data returned by file_detach(). + * + * 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_close(FAR struct file *filep) +{ + struct inode *inode; + int ret = OK; + + DEBUGASSERT(filep != NULL); + inode = filep->f_inode; + + /* Check if the struct file is open (i.e., assigned an inode) */ + + if (inode) + { + /* Close the file, driver, or mountpoint. */ + + if (inode->u.i_ops && inode->u.i_ops->close) + { + /* Perform the close operation */ + + ret = inode->u.i_ops->close(filep); + } + + /* And release the inode */ + + inode_release(inode); + + /* Reset the user file struct instance so that it cannot be reused. */ + + filep->f_oflags = 0; + filep->f_pos = 0; + filep->f_inode = NULL; + filep->f_priv = NULL; + } + + return ret; +} diff --git a/fs/inode/fs_filedetach.c b/fs/inode/fs_filedetach.c index c79929b68ae..c02aa8ea7db 100644 --- a/fs/inode/fs_filedetach.c +++ b/fs/inode/fs_filedetach.c @@ -167,56 +167,3 @@ int file_detach(int fd, FAR struct file *filep) } #endif -/**************************************************************************** - * Name: file_close - * - * Description: - * Close a file that was previously detached with file_detach(). - * - * REVISIT: This is essentially the same as _files_close() - * - * Input Parameters: - * filep - A pointer to a user provided memory location containing the - * open file data returned by file_detach(). - * - * 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_close(FAR struct file *filep) -{ - struct inode *inode; - int ret = OK; - - DEBUGASSERT(filep != NULL); - inode = filep->f_inode; - - /* Check if the struct file is open (i.e., assigned an inode) */ - - if (inode) - { - /* Close the file, driver, or mountpoint. */ - - if (inode->u.i_ops && inode->u.i_ops->close) - { - /* Perform the close operation */ - - ret = inode->u.i_ops->close(filep); - } - - /* And release the inode */ - - inode_release(inode); - - /* Reset the user file struct instance so that it cannot be reused. */ - - filep->f_oflags = 0; - filep->f_pos = 0; - filep->f_inode = NULL; - filep->f_priv = NULL; - } - - return ret; -} diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h index 78ed5621aeb..b611ad675ca 100644 --- a/include/nuttx/fs/fs.h +++ b/include/nuttx/fs/fs.h @@ -783,7 +783,8 @@ int file_detach(int fd, FAR struct file *filep); * Name: file_close * * Description: - * Close a file that was previously detached with file_detach(). + * Close a file that was previously opened with file_open() (or detached + * with file_detach()). * * Input Parameters: * filep - A pointer to a user provided memory location containing the