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

fs/nfs: Should return the partial transfer bytes in nfs_read/nfs_write

Browse Source
This commit is contained in:
Xiang Xiao
2020-03-02 16:50:12 +08:00
committed by Gregory Nutt
parent 2524837d79
commit 6c77829940
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/nfs/nfs_vfsops.c
+2 -10
View File
@@ -920,13 +920,9 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
} }
} }
finfo("Read %d bytes\n", bytesread);
nfs_semgive(nmp);
return bytesread;
errout_with_semaphore: errout_with_semaphore:
nfs_semgive(nmp); nfs_semgive(nmp);
return error; return bytesread > 0 ? bytesread : error;
} }
/**************************************************************************** /****************************************************************************
@@ -1108,12 +1104,9 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer,
buffer += writesize; buffer += writesize;
} }
nfs_semgive(nmp);
return byteswritten;
errout_with_semaphore: errout_with_semaphore:
nfs_semgive(nmp); nfs_semgive(nmp);
return error; return byteswritten > 0 ? byteswritten : error;
} }
/**************************************************************************** /****************************************************************************
@@ -1301,7 +1294,6 @@ static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
DEBUGASSERT(fhandle.length <= DIRENT_NFS_MAXHANDLE); DEBUGASSERT(fhandle.length <= DIRENT_NFS_MAXHANDLE);
memcpy(dir->u.nfs.nfs_fhandle, &fhandle.handle, fhandle.length); memcpy(dir->u.nfs.nfs_fhandle, &fhandle.handle, fhandle.length);
error = OK;
errout_with_semaphore: errout_with_semaphore:
nfs_semgive(nmp); nfs_semgive(nmp);