From: Milan Broz Date: Tue, 21 Oct 2008 16:45:03 +0000 (+0100) Subject: dm crypt: remove waitqueue X-Git-Tag: v2.6.28-rc1~41^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0a4a1047a445062793d9004bcb0d52756726fdf5;p=linux-2.6-omap-h63xx.git dm crypt: remove waitqueue Remove waitqueue no longer needed with the async crypto interface. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon --- diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 046ee516074..ce26c84af06 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -94,7 +94,6 @@ struct crypt_config { struct workqueue_struct *io_queue; struct workqueue_struct *crypt_queue; - wait_queue_head_t writeq; /* * crypto related data @@ -656,10 +655,7 @@ static void kcryptd_io_read(struct dm_crypt_io *io) static void kcryptd_io_write(struct dm_crypt_io *io) { struct bio *clone = io->ctx.bio_out; - struct crypt_config *cc = io->target->private; - generic_make_request(clone); - wake_up(&cc->writeq); } static void kcryptd_io(struct work_struct *work) @@ -791,9 +787,6 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) io = new_io; } - - if (unlikely(remaining)) - wait_event(cc->writeq, !atomic_read(&io->ctx.pending)); } crypt_dec_pending(io); @@ -1120,7 +1113,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) goto bad_crypt_queue; } - init_waitqueue_head(&cc->writeq); ti->private = cc; return 0;