Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-26 10:46:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
many locations:  Change occurences of open() followed by file_detach() to file_open().  Change most non-controversion calls to open() to nx_open().

    fs/inode/fs_fileopen.c:  Flesh out file_open() with some interim, placeholder logic.

    fs/inode/fs_fileopen.c:  Add a framework for a file_open() implementation (no real logic in place yet).

    fs/vfs/fs_open.c:  Add nx_open() which is the same as open() except that it does not create a cancellation point nor does it modify the errno variable.
This commit is contained in:
Gregory Nutt
2018-09-15 10:49:41 -06:00
parent 17b0c9b6b0
commit a7fd58c4db
34 changed files with 375 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/loop/losetup.c
+6 -17
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* drivers/loop/losetup.c
*
* Copyright (C) 2008-2009, 2011, 2014-2015, 2017 Gregory Nutt. All
* Copyright (C) 2008-2009, 2011, 2014-2015, 2017-2018 Gregory Nutt. All
* rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
@@ -373,7 +373,6 @@ int losetup(FAR const char *devname, FAR const char *filename,
FAR struct loop_struct_s *dev;
struct stat sb;
int ret;
int fd = -1;
/* Sanity check */
@@ -424,12 +423,13 @@ int losetup(FAR const char *devname, FAR const char *filename,
* to open it readonly).
*/
ret = -ENOSYS;
if (!readonly)
{
fd = open(filename, O_RDWR);
ret = file_open(&dev->devfile, filename, O_RDWR);
}
if (fd >= 0)
if (ret >= 0)
{
dev->writeenabled = true; /* Success */
}
@@ -438,25 +438,14 @@ int losetup(FAR const char *devname, FAR const char *filename,
{
/* If that fails, then try to open the device read-only */
fd = open(filename, O_RDONLY);
if (fd < 0)
ret = file_open(&dev->devfile, filename, O_RDONLY);
if (ret < 0)
{
ret = -get_errno();
ferr("ERROR: Failed to open %s: %d\n", filename, ret);
goto errout_with_dev;
}
}
/* Detach the file from the file descriptor */
ret = file_detach(fd, &dev->devfile);
if (ret < 0)
{
ferr("ERROR: Failed to open %s: %d\n", filename, ret);
close(fd);
goto errout_with_dev;
}
/* Inode private data will be reference to the loop device structure */
ret = register_blockdriver(devname, &g_bops, 0, dev);