fs/uio: do not overwrite the return value

anchao · anchao · commit 4fae1b3f2efb · 2025-01-21T20:14:32.000+08:00
Signed-off-by: chao an &lt;anchao.archer@bytedance.com&gt;
diff --git a/fs/vfs/fs_uio.c b/fs/vfs/fs_uio.c
@@ -82,8 +82,8 @@ ssize_t uio_calc_resid(FAR const struct uio *uio)
 void uio_advance(FAR struct uio *uio, size_t sz)
 {
   FAR const struct iovec *iov = uio->uio_iov;
-  int iovcnt = uio->uio_iovcnt;
   size_t offset_in_iov = uio->uio_offset_in_iov;
+  int iovcnt = uio->uio_iovcnt;
 
   DEBUGASSERT(sz <= SSIZE_MAX);
   DEBUGASSERT(uio->uio_resid <= SSIZE_MAX);
@@ -131,7 +131,7 @@ int uio_init(FAR struct uio *uio, FAR const struct iovec *iov, int iovcnt)
   resid = uio_calc_resid(uio);
   if (resid < 0)
     {
-      return -EINVAL;
+      return resid;
     }
 
   uio->uio_resid = resid;

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ ssize_t uio_calc_resid(FAR const struct uio *uio)`
`82`	`82`	`void uio_advance(FAR struct uio *uio, size_t sz)`
`83`	`83`	`{`
`84`	`84`	`FAR const struct iovec *iov = uio->uio_iov;`
`85`		`- int iovcnt = uio->uio_iovcnt;`
`86`	`85`	`size_t offset_in_iov = uio->uio_offset_in_iov;`
	`86`	`+ int iovcnt = uio->uio_iovcnt;`
`87`	`87`
`88`	`88`	`DEBUGASSERT(sz <= SSIZE_MAX);`
`89`	`89`	`DEBUGASSERT(uio->uio_resid <= SSIZE_MAX);`
`@@ -131,7 +131,7 @@ int uio_init(FAR struct uio uio, FAR const struct iovec iov, int iovcnt)`
`131`	`131`	`resid = uio_calc_resid(uio);`
`132`	`132`	`if (resid < 0)`
`133`	`133`	`{`
`134`		`- return -EINVAL;`
	`134`	`+ return resid;`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`uio->uio_resid = resid;`