OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TMPFS: Fixes several bugs

This commit is contained in:
Gregory Nutt 2015-10-10 15:26:07 -06:00
parent f0be2b7b09
commit d6fa78a1b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs

@ -1 +1 @@
Subproject commit b16519ea24e26d50c61202ea80802a0417daeb11
Subproject commit 20921ccad2cf456d6828d5d9f4ec8763a5f31f1f

8
fs/tmpfs/fs_tmpfs.c
View File

@ -409,7 +409,7 @@ static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
/* Realloc the file object */
newtfo = (FAR struct tmpfs_file_s *)kmm_realloc(oldtfo, objsize);
newtfo = (FAR struct tmpfs_file_s *)kmm_realloc(oldtfo, allocsize);
if (newtfo == NULL)
{
return -ENOMEM;
@ -423,7 +423,7 @@ static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
/* Return the new address of the reallocated file object */
newtfo->tfo_alloc = allocsize;
newtfo->tfo_size = objsize;
newtfo->tfo_size = newsize;
*tfo = newtfo;
return OK;
}
@ -1558,7 +1558,7 @@ static ssize_t tmpfs_read(FAR struct file *filep, FAR char *buffer,
/* Copy data from the memory object to the user buffer */
memcpy(buffer, &tfo->tfo_data, nread);
memcpy(buffer, &tfo->tfo_data[startpos], nread);
filep->f_pos += nread;
/* Release the lock on the file */
@ -1613,7 +1613,7 @@ static ssize_t tmpfs_write(FAR struct file *filep, FAR const char *buffer,
/* Copy data from the memory object to the user buffer */
memcpy(&tfo->tfo_data, buffer, nwritten);
memcpy(&tfo->tfo_data[startpos], buffer, nwritten);
filep->f_pos += nwritten;
/* Release the lock on the file */