---

yaml --- r: 84716 b: refs/heads/master c: 7adfa2f h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · f744285 · f744285
1 parent 5b8110b
commit f744285
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25478445c4a39318acbe08ba8df7945766cbb5b5
+refs/heads/master: 7adfa2ff3efa02a7a9f2632d2d2662d3e5eb5304
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
@@ -1347,6 +1347,13 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb)
 	if ((ret == 0) || (iocb->ki_left == 0))
 		ret = iocb->ki_nbytes - iocb->ki_left;
 
+	/* If we managed to write some out we return that, rather than
+	 * the eventual error. */
+	if (opcode == IOCB_CMD_PWRITEV
+	    && ret < 0 && ret != -EIOCBQUEUED && ret != -EIOCBRETRY
+	    && iocb->ki_nbytes - iocb->ki_left)
+		ret = iocb->ki_nbytes - iocb->ki_left;
+
 	return ret;
 }