aio: remove spurious ring head index modulo info->nr
PATCH 1/1 aio: remove spurious ring head index modulo info->nr
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 <[email protected]>
fs/aio.c renamed from fs/aio.c.orig +2 -2
@@ -1019,7 +1019,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 );
@@ -1032,7 +1032,7 @@ static int aio_read_evt(struct kioctx *ispin_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;
Quoted 2 lines
This makes the modulo of
ring->headinto local variable head unnecessary. This patch removes that bogus code.
Looks fine to me:
Acked-by Zach Brown <[email protected]>
- z