Commit 97d2a80584b30b5cd32da411deca1986ef61877a
Committed by
Linus Torvalds
Linus Torvalds
1 parent
b62e8ec2ac
[PATCH] aio: remove ki_retried debugging member
Remove the ki_retried member from struct kiocb. I think the idea was bounced around a while back, but Arnaldo pointed out another reason that we should dig it up when he pointed out that the last cacheline of struct kiocb only contains 4 bytes. By removing the debugging member, we save more than the 8 byte on 64 bit machines. Signed-off-by: Benjamin LaHaise <bcrl@kvack.org> Acked-by: Ken Chen <kenneth.w.chen@intel.com> Acked-by: Zach Brown <zach.brown@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 2 changed files with 0 additions and 17 deletions Side-by-side Diff
fs/aio.c
| ... | ... | @@ -666,17 +666,6 @@ |
| 666 | 666 | ssize_t (*retry)(struct kiocb *); |
| 667 | 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 | 669 | if (!(retry = iocb->ki_retry)) { |
| 681 | 670 | printk("aio_run_iocb: iocb->ki_retry = NULL\n"); |
| 682 | 671 | return 0; |
| ... | ... | @@ -1005,9 +994,6 @@ |
| 1005 | 994 | kunmap_atomic(ring, KM_IRQ1); |
| 1006 | 995 | |
| 1007 | 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 | 997 | put_rq: |
| 1012 | 998 | /* everything turned out well, dispose of the aiocb. */ |
| 1013 | 999 | ret = __aio_put_req(ctx, iocb); |
| ... | ... | @@ -1590,7 +1576,6 @@ |
| 1590 | 1576 | req->ki_opcode = iocb->aio_lio_opcode; |
| 1591 | 1577 | init_waitqueue_func_entry(&req->ki_wait, aio_wake_function); |
| 1592 | 1578 | INIT_LIST_HEAD(&req->ki_wait.task_list); |
| 1593 | - req->ki_retried = 0; | |
| 1594 | 1579 | |
| 1595 | 1580 | ret = aio_setup_iocb(req); |
| 1596 | 1581 |
include/linux/aio.h
| ... | ... | @@ -111,7 +111,6 @@ |
| 111 | 111 | size_t ki_nbytes; /* copy of iocb->aio_nbytes */ |
| 112 | 112 | char __user *ki_buf; /* remaining iocb->aio_buf */ |
| 113 | 113 | size_t ki_left; /* remaining bytes */ |
| 114 | - long ki_retried; /* just for testing */ | |
| 115 | 114 | struct iovec ki_inline_vec; /* inline vector */ |
| 116 | 115 | struct iovec *ki_iovec; |
| 117 | 116 | unsigned long ki_nr_segs; |
| ... | ... | @@ -238,7 +237,6 @@ |
| 238 | 237 | } while (0) |
| 239 | 238 | |
| 240 | 239 | #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait) |
| 241 | -#define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1) | |
| 242 | 240 | |
| 243 | 241 | #include <linux/aio_abi.h> |
| 244 | 242 |