X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=blobdiff_plain;f=mm%2Ffilemap.c;h=6b965efe215e80696a52d73bebe26b4b64bf902c;hp=daef091d4c504430e45cacce7373ab847f1615b1;hb=c3a690240423fc4eb8a0c3c7df025d13eadf140b;hpb=80fac0f577a35c437219a2786c1804ab8ca1e998

diff --git a/mm/filemap.c b/mm/filemap.c
index daef091d4c50..6b965efe215e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -887,9 +887,9 @@ EXPORT_SYMBOL(end_page_writeback);
  * After completing I/O on a page, call this routine to update the page
  * flags appropriately
  */
-void page_endio(struct page *page, int op, int err)
+void page_endio(struct page *page, bool is_write, int err)
 {
-	if (!op_is_write(op)) {
+	if (!is_write) {
 		if (!err) {
 			SetPageUptodate(page);
 		} else {
@@ -1920,7 +1920,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 			retval = mapping->a_ops->direct_IO(iocb, &data);
 		}
 
-		if (retval > 0) {
+		if (retval >= 0) {
 			iocb->ki_pos += retval;
 			iov_iter_advance(iter, retval);
 		}