Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88241
b: refs/heads/master
c: 8d1c98b
h: refs/heads/master
i:
  88239: 74ee94e
v: v3
  • Loading branch information
Davide Libenzi authored and Linus Torvalds committed Apr 11, 2008
1 parent 59e6f5a commit ed99644
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d479540dbaba6f7acdb48e0242fee868c7a68116
refs/heads/master: 8d1c98b0b5c0148b519c6416e689ef6a89ffcea3
17 changes: 9 additions & 8 deletions trunk/fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -936,14 +936,6 @@ int aio_complete(struct kiocb *iocb, long res, long res2)
return 1;
}

/*
* Check if the user asked us to deliver the result through an
* eventfd. The eventfd_signal() function is safe to be called
* from IRQ context.
*/
if (!IS_ERR(iocb->ki_eventfd))
eventfd_signal(iocb->ki_eventfd, 1);

info = &ctx->ring_info;

/* add a completion event to the ring buffer.
Expand Down Expand Up @@ -992,6 +984,15 @@ int aio_complete(struct kiocb *iocb, long res, long res2)
kunmap_atomic(ring, KM_IRQ1);

pr_debug("added to ring %p at [%lu]\n", iocb, tail);

/*
* Check if the user asked us to deliver the result through an
* eventfd. The eventfd_signal() function is safe to be called
* from IRQ context.
*/
if (!IS_ERR(iocb->ki_eventfd))
eventfd_signal(iocb->ki_eventfd, 1);

put_rq:
/* everything turned out well, dispose of the aiocb. */
ret = __aio_put_req(ctx, iocb);
Expand Down

0 comments on commit ed99644

Please sign in to comment.