sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/mmap: try rammap when filesystem mmap don't support

Browse Source 
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1 2023-03-10 11:20:14 +08:00 committed by Petro Karashchenko
parent 7b0d80c94a
commit f8b27d9fbe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/mmap/fs_mmap.c
View File

@ -50,7 +50,7 @@ static int file_mmap_(FAR struct file *filep, FAR void *start,
size_t length, int prot, int flags, size_t length, int prot, int flags,
off_t offset, bool kernel, FAR void **mapped) off_t offset, bool kernel, FAR void **mapped)
{ {
int ret; int ret = -ENOTTY;
/* Pass the information about the mapping in mm_map_entry_s structure. /* Pass the information about the mapping in mm_map_entry_s structure.
* The driver may alter the structure, and if it supports unmap, it * The driver may alter the structure, and if it supports unmap, it
@ -133,7 +133,8 @@ static int file_mmap_(FAR struct file *filep, FAR void *start,
{ {
ret = filep->f_inode->u.i_ops->mmap(filep, &entry); ret = filep->f_inode->u.i_ops->mmap(filep, &entry);
} }
else
if (ret == -ENOTTY)
{ {
/* Caller request the private mapping. Or not directly mappable, /* Caller request the private mapping. Or not directly mappable,
* probably because the underlying media doesn't support random access. * probably because the underlying media doesn't support random access.

5
fs/romfs/fs_romfs.c
View File

@ -612,7 +612,6 @@ static int romfs_mmap(FAR struct file *filep, FAR struct mm_map_entry_s *map)
{ {
FAR struct romfs_mountpt_s *rm; FAR struct romfs_mountpt_s *rm;
FAR struct romfs_file_s *rf; FAR struct romfs_file_s *rf;
int ret = -EINVAL;
/* Sanity checks */ /* Sanity checks */
@ -631,10 +630,10 @@ static int romfs_mmap(FAR struct file *filep, FAR struct mm_map_entry_s *map)
map->length != 0 && map->offset + map->length <= rf->rf_size) map->length != 0 && map->offset + map->length <= rf->rf_size)
{ {
map->vaddr = rm->rm_xipbase + rf->rf_startoffset + map->offset; map->vaddr = rm->rm_xipbase + rf->rf_startoffset + map->offset;
ret = OK; return OK;
} }
return ret; return -ENOTTY;
} }
/**************************************************************************** /****************************************************************************