make aio_read()/aio_write() return int

Al Viro · Al Viro · commit 958c13ce141c · 2019-03-17T20:52:29.000-04:00
that ssize_t is a rudiment of earlier calling conventions; it's been
used only to pass 0 and -E... since last autumn.

Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/aio.c b/fs/aio.c
@@ -1513,13 +1513,13 @@ static inline void aio_rw_done(struct kiocb *req, ssize_t ret)
 	}
 }
 
-static ssize_t aio_read(struct kiocb *req, const struct iocb *iocb,
+static int aio_read(struct kiocb *req, const struct iocb *iocb,
 			bool vectored, bool compat)
 {
 	struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
 	struct iov_iter iter;
 	struct file *file;
-	ssize_t ret;
+	int ret;
 
 	ret = aio_prep_rw(req, iocb);
 	if (ret)
@@ -1541,13 +1541,13 @@ static ssize_t aio_read(struct kiocb *req, const struct iocb *iocb,
 	return ret;
 }
 
-static ssize_t aio_write(struct kiocb *req, const struct iocb *iocb,
+static int aio_write(struct kiocb *req, const struct iocb *iocb,
 			 bool vectored, bool compat)
 {
 	struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
 	struct iov_iter iter;
 	struct file *file;
-	ssize_t ret;
+	int ret;
 
 	ret = aio_prep_rw(req, iocb);
 	if (ret)
@@ -1710,7 +1710,7 @@ aio_poll_queue_proc(struct file *file, struct wait_queue_head *head,
 	add_wait_queue(head, &pt->iocb->poll.wait);
 }
 
-static ssize_t aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb)
+static int aio_poll(struct aio_kiocb *aiocb, const struct iocb *iocb)
 {
 	struct kioctx *ctx = aiocb->ki_ctx;
 	struct poll_iocb *req = &aiocb->poll;
@@ -1775,7 +1775,7 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
 			   struct iocb __user *user_iocb, bool compat)
 {
 	struct aio_kiocb *req;
-	ssize_t ret;
+	int ret;
 
 	/* enforce forwards compatibility on users */
 	if (unlikely(iocb->aio_reserved2)) {

Original file line number	Diff line number	Diff line change
`@@ -1513,13 +1513,13 @@ static inline void aio_rw_done(struct kiocb *req, ssize_t ret)`
`1513`	`1513`	`}`
`1514`	`1514`	`}`
`1515`	`1515`
`1516`		`-static ssize_t aio_read(struct kiocb req, const struct iocb iocb,`
	`1516`	`+static int aio_read(struct kiocb req, const struct iocb iocb,`
`1517`	`1517`	`bool vectored, bool compat)`
`1518`	`1518`	`{`
`1519`	`1519`	`struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;`
`1520`	`1520`	`struct iov_iter iter;`
`1521`	`1521`	`struct file *file;`
`1522`		`- ssize_t ret;`
	`1522`	`+ int ret;`
`1523`	`1523`
`1524`	`1524`	`ret = aio_prep_rw(req, iocb);`
`1525`	`1525`	`if (ret)`
`@@ -1541,13 +1541,13 @@ static ssize_t aio_read(struct kiocb req, const struct iocb iocb,`
`1541`	`1541`	`return ret;`
`1542`	`1542`	`}`
`1543`	`1543`
`1544`		`-static ssize_t aio_write(struct kiocb req, const struct iocb iocb,`
	`1544`	`+static int aio_write(struct kiocb req, const struct iocb iocb,`
`1545`	`1545`	`bool vectored, bool compat)`
`1546`	`1546`	`{`
`1547`	`1547`	`struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;`
`1548`	`1548`	`struct iov_iter iter;`
`1549`	`1549`	`struct file *file;`
`1550`		`- ssize_t ret;`
	`1550`	`+ int ret;`
`1551`	`1551`
`1552`	`1552`	`ret = aio_prep_rw(req, iocb);`
`1553`	`1553`	`if (ret)`
`@@ -1710,7 +1710,7 @@ aio_poll_queue_proc(struct file file, struct wait_queue_head head,`
`1710`	`1710`	`add_wait_queue(head, &pt->iocb->poll.wait);`
`1711`	`1711`	`}`
`1712`	`1712`
`1713`		`-static ssize_t aio_poll(struct aio_kiocb aiocb, const struct iocb iocb)`
	`1713`	`+static int aio_poll(struct aio_kiocb aiocb, const struct iocb iocb)`
`1714`	`1714`	`{`
`1715`	`1715`	`struct kioctx *ctx = aiocb->ki_ctx;`
`1716`	`1716`	`struct poll_iocb *req = &aiocb->poll;`
`@@ -1775,7 +1775,7 @@ static int __io_submit_one(struct kioctx ctx, const struct iocb iocb,`
`1775`	`1775`	`struct iocb __user *user_iocb, bool compat)`
`1776`	`1776`	`{`
`1777`	`1777`	`struct aio_kiocb *req;`
`1778`		`- ssize_t ret;`
	`1778`	`+ int ret;`
`1779`	`1779`
`1780`	`1780`	`/* enforce forwards compatibility on users */`
`1781`	`1781`	`if (unlikely(iocb->aio_reserved2)) {`