The patch titled
aio: remove spurious ring head index modulo info->nr
has been removed from the -mm tree. Its filename was
aio-remove-spurious-ring-head-index-modulo-info-nr.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: aio: remove spurious ring head index modulo info->nr
From: "Chen, Kenneth W" <kenneth.w.chen@xxxxxxxxx>
In aio_read_evt(), the ring->head will never wrap info->nr because
we already does the wrap when updating the ring head index:
if (head != ring->tail) {
...
head = (head + 1) % info->nr;
ring->head = head;
}
This makes the modulo of ring->head into local variable head unnecessary.
This patch removes that bogus code.
Signed-off-by: Ken Chen <kenneth.w.chen@xxxxxxxxx>
Cc: Zach Brown <zach.brown@xxxxxxxxxx>
Cc: Suparna Bhattacharya <suparna@xxxxxxxxxx>
Cc: Benjamin LaHaise <bcrl@xxxxxxxxx>
Cc: Badari Pulavarty <pbadari@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/aio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/aio.c~aio-remove-spurious-ring-head-index-modulo-info-nr fs/aio.c
--- a/fs/aio.c~aio-remove-spurious-ring-head-index-modulo-info-nr
+++ a/fs/aio.c
@@ -1036,7 +1036,7 @@ static int aio_read_evt(struct kioctx *i
{
struct aio_ring_info *info = &ioctx->ring_info;
struct aio_ring *ring;
- unsigned long head;
+ unsigned int head;
int ret = 0;
ring = kmap_atomic(info->ring_pages[0], KM_USER0);
@@ -1049,7 +1049,7 @@ static int aio_read_evt(struct kioctx *i
spin_lock(&info->ring_lock);
- head = ring->head % info->nr;
+ head = ring->head;
if (head != ring->tail) {
struct io_event *evp = aio_ring_event(info, head, KM_USER1);
*ent = *evp;
_
Patches currently in -mm which might be from kenneth.w.chen@xxxxxxxxx are
ia64-alignment-bug-in-ldscript.patch
aio-fix-buggy-put_ioctx-call-in-aio_complete-v2.patch
aio-remove-spurious-ring-head-index-modulo-info-nr.patch
aio-make-aio_ring_info-nr_pages-an-unsigned-int.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
