From: NeilBrown Date: Tue, 20 Nov 2012 03:11:15 +0000 (+1100) Subject: md/raid5: use async_tx_quiesce() instead of open-coding it. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=749586b7d34df910118bff2c248d08877d772e81;p=linux-beck.git md/raid5: use async_tx_quiesce() instead of open-coding it. handle_stripe_expansion contains: if (tx) { async_tx_ack(tx); dma_wait_for_async_tx(tx); } which is very similar to the body of async_tx_quiesce(), except that the later handles an error from dma_wait_for_async_tx() (admittedly by panicing, but that decision belongs in the dma code, not the md code). So just us async_tx_quiesce(). Acked-by: Dan Williams Reported-by: Bartlomiej Zolnierkiewicz Signed-off-by: NeilBrown --- diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a4502686e7a8..2cf23f23ddca 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3224,10 +3224,7 @@ static void handle_stripe_expansion(struct r5conf *conf, struct stripe_head *sh) } /* done submitting copies, wait for them to complete */ - if (tx) { - async_tx_ack(tx); - dma_wait_for_async_tx(tx); - } + async_tx_quiesce(&tx); } /*