diff options
author | Milan Broz <mbroz@redhat.com> | 2008-10-21 12:45:03 -0400 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2008-10-21 12:45:03 -0400 |
commit | 0a4a1047a445062793d9004bcb0d52756726fdf5 (patch) | |
tree | 4fb581827ae3951c0737188301208a4fb73831e3 /drivers/md | |
parent | 393b47ef23bbcf16890c907d0144b5a8ec4caebf (diff) |
dm crypt: remove waitqueue
Remove waitqueue no longer needed with the async crypto interface.
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 046ee516074b..ce26c84af064 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -94,7 +94,6 @@ struct crypt_config { | |||
94 | 94 | ||
95 | struct workqueue_struct *io_queue; | 95 | struct workqueue_struct *io_queue; |
96 | struct workqueue_struct *crypt_queue; | 96 | struct workqueue_struct *crypt_queue; |
97 | wait_queue_head_t writeq; | ||
98 | 97 | ||
99 | /* | 98 | /* |
100 | * crypto related data | 99 | * crypto related data |
@@ -656,10 +655,7 @@ static void kcryptd_io_read(struct dm_crypt_io *io) | |||
656 | static void kcryptd_io_write(struct dm_crypt_io *io) | 655 | static void kcryptd_io_write(struct dm_crypt_io *io) |
657 | { | 656 | { |
658 | struct bio *clone = io->ctx.bio_out; | 657 | struct bio *clone = io->ctx.bio_out; |
659 | struct crypt_config *cc = io->target->private; | ||
660 | |||
661 | generic_make_request(clone); | 658 | generic_make_request(clone); |
662 | wake_up(&cc->writeq); | ||
663 | } | 659 | } |
664 | 660 | ||
665 | static void kcryptd_io(struct work_struct *work) | 661 | static void kcryptd_io(struct work_struct *work) |
@@ -791,9 +787,6 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) | |||
791 | 787 | ||
792 | io = new_io; | 788 | io = new_io; |
793 | } | 789 | } |
794 | |||
795 | if (unlikely(remaining)) | ||
796 | wait_event(cc->writeq, !atomic_read(&io->ctx.pending)); | ||
797 | } | 790 | } |
798 | 791 | ||
799 | crypt_dec_pending(io); | 792 | crypt_dec_pending(io); |
@@ -1120,7 +1113,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) | |||
1120 | goto bad_crypt_queue; | 1113 | goto bad_crypt_queue; |
1121 | } | 1114 | } |
1122 | 1115 | ||
1123 | init_waitqueue_head(&cc->writeq); | ||
1124 | ti->private = cc; | 1116 | ti->private = cc; |
1125 | return 0; | 1117 | return 0; |
1126 | 1118 | ||