aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorMilan Broz <mbroz@redhat.com>2008-10-10 08:37:07 -0400
committerAlasdair G Kergon <agk@redhat.com>2008-10-10 08:37:07 -0400
commit4e59409891c9cc30cb4d5d73250b0c968af8e39b (patch)
treec21382942df3b7dd363bca91fe5cd8fef3c64f0b /drivers/md
parent6c031f41db15b6cb0cd33545cec28ca706cd3c7e (diff)
dm crypt: fix async inc_pending
The pending reference count must be incremented *before* the async work is queued to another thread, not after. Otherwise there's a race if the work completes and decrements the reference count before it gets incremented. Signed-off-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-crypt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d8126ac82960..262ed1816695 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -719,16 +719,15 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
719 719
720 remaining -= clone->bi_size; 720 remaining -= clone->bi_size;
721 721
722 crypt_inc_pending(io);
722 r = crypt_convert(cc, &io->ctx); 723 r = crypt_convert(cc, &io->ctx);
723 724
724 if (atomic_dec_and_test(&io->ctx.pending)) { 725 if (atomic_dec_and_test(&io->ctx.pending)) {
725 /* processed, no running async crypto */ 726 /* processed, no running async crypto */
726 crypt_inc_pending(io);
727 kcryptd_crypt_write_io_submit(io, r, 0); 727 kcryptd_crypt_write_io_submit(io, r, 0);
728 if (unlikely(r < 0)) 728 if (unlikely(r < 0))
729 break; 729 break;
730 } else 730 }
731 crypt_inc_pending(io);
732 731
733 /* out of memory -> run queues */ 732 /* out of memory -> run queues */
734 if (unlikely(remaining)) { 733 if (unlikely(remaining)) {