diff options
Diffstat (limited to 'fs/aio.c')
-rw-r--r-- | fs/aio.c | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -666,17 +666,6 @@ static ssize_t aio_run_iocb(struct kiocb *iocb) | |||
666 | ssize_t (*retry)(struct kiocb *); | 666 | ssize_t (*retry)(struct kiocb *); |
667 | ssize_t ret; | 667 | ssize_t ret; |
668 | 668 | ||
669 | if (iocb->ki_retried++ > 1024*1024) { | ||
670 | printk("Maximal retry count. Bytes done %Zd\n", | ||
671 | iocb->ki_nbytes - iocb->ki_left); | ||
672 | return -EAGAIN; | ||
673 | } | ||
674 | |||
675 | if (!(iocb->ki_retried & 0xff)) { | ||
676 | pr_debug("%ld retry: %zd of %zd\n", iocb->ki_retried, | ||
677 | iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes); | ||
678 | } | ||
679 | |||
680 | if (!(retry = iocb->ki_retry)) { | 669 | if (!(retry = iocb->ki_retry)) { |
681 | printk("aio_run_iocb: iocb->ki_retry = NULL\n"); | 670 | printk("aio_run_iocb: iocb->ki_retry = NULL\n"); |
682 | return 0; | 671 | return 0; |
@@ -1005,9 +994,6 @@ int fastcall aio_complete(struct kiocb *iocb, long res, long res2) | |||
1005 | kunmap_atomic(ring, KM_IRQ1); | 994 | kunmap_atomic(ring, KM_IRQ1); |
1006 | 995 | ||
1007 | pr_debug("added to ring %p at [%lu]\n", iocb, tail); | 996 | pr_debug("added to ring %p at [%lu]\n", iocb, tail); |
1008 | |||
1009 | pr_debug("%ld retries: %zd of %zd\n", iocb->ki_retried, | ||
1010 | iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes); | ||
1011 | put_rq: | 997 | put_rq: |
1012 | /* everything turned out well, dispose of the aiocb. */ | 998 | /* everything turned out well, dispose of the aiocb. */ |
1013 | ret = __aio_put_req(ctx, iocb); | 999 | ret = __aio_put_req(ctx, iocb); |
@@ -1590,7 +1576,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, | |||
1590 | req->ki_opcode = iocb->aio_lio_opcode; | 1576 | req->ki_opcode = iocb->aio_lio_opcode; |
1591 | init_waitqueue_func_entry(&req->ki_wait, aio_wake_function); | 1577 | init_waitqueue_func_entry(&req->ki_wait, aio_wake_function); |
1592 | INIT_LIST_HEAD(&req->ki_wait.task_list); | 1578 | INIT_LIST_HEAD(&req->ki_wait.task_list); |
1593 | req->ki_retried = 0; | ||
1594 | 1579 | ||
1595 | ret = aio_setup_iocb(req); | 1580 | ret = aio_setup_iocb(req); |
1596 | 1581 | ||