diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /fs/aio.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -641,7 +641,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb) | |||
| 641 | * invoked both for initial i/o submission and | 641 | * invoked both for initial i/o submission and |
| 642 | * subsequent retries via the aio_kick_handler. | 642 | * subsequent retries via the aio_kick_handler. |
| 643 | * Expects to be invoked with iocb->ki_ctx->lock | 643 | * Expects to be invoked with iocb->ki_ctx->lock |
| 644 | * already held. The lock is released and reaquired | 644 | * already held. The lock is released and reacquired |
| 645 | * as needed during processing. | 645 | * as needed during processing. |
| 646 | * | 646 | * |
| 647 | * Calls the iocb retry method (already setup for the | 647 | * Calls the iocb retry method (already setup for the |