X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=fs%2Faio.c;h=e41e932ba489ff040fe9ed43385fc164a8dd6515;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=950630187acc72a781de4cc6ef936045be5bd0be;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/fs/aio.c b/fs/aio.c
index 950630187..e41e932ba 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -641,7 +641,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb)
  *	invoked both for initial i/o submission and
  *	subsequent retries via the aio_kick_handler.
  *	Expects to be invoked with iocb->ki_ctx->lock
- *	already held. The lock is released and reacquired
+ *	already held. The lock is released and reaquired
  *	as needed during processing.
  *
  * Calls the iocb retry method (already setup for the
@@ -777,11 +777,11 @@ out:
 static int __aio_run_iocbs(struct kioctx *ctx)
 {
 	struct kiocb *iocb;
-	struct list_head run_list;
+	LIST_HEAD(run_list);
 
 	assert_spin_locked(&ctx->ctx_lock);
 
-	list_replace_init(&ctx->run_list, &run_list);
+	list_splice_init(&ctx->run_list, &run_list);
 	while (!list_empty(&run_list)) {
 		iocb = list_entry(run_list.next, struct kiocb,
 			ki_run_list);