From: Milan Broz Rename functions to follow calling convention. Prepare write io error processing function skeleton. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon --- drivers/md/dm-crypt.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) Index: linux-2.6.24-rc2/drivers/md/dm-crypt.c =================================================================== --- linux-2.6.24-rc2.orig/drivers/md/dm-crypt.c 2007-11-09 12:05:52.000000000 +0000 +++ linux-2.6.24-rc2/drivers/md/dm-crypt.c 2007-11-09 12:05:53.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright (C) 2003 Christophe Saout * Copyright (C) 2004 Clemens Fruhwirth - * Copyright (C) 2006 Red Hat, Inc. All rights reserved. + * Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved. * * This file is released under the GPL. */ @@ -291,6 +291,9 @@ static struct crypt_iv_operations crypt_ .generator = crypt_iv_null_gen }; +static void crypt_read_io_done(struct dm_crypt_io *io, int error); +static void crypt_write_io_done(struct dm_crypt_io *io, int error); + static int crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out, struct scatterlist *in, unsigned int length, @@ -483,14 +486,14 @@ static void crypt_dec_pending(struct dm_ * starved by new requests which can block in the first stages due * to memory allocation. */ -static void kcryptd_do_work(struct work_struct *work); +static void kcryptd_do_io(struct work_struct *work); static void kcryptd_do_crypt(struct work_struct *work); static void kcryptd_queue_io(struct dm_crypt_io *io) { struct crypt_config *cc = io->target->private; - INIT_WORK(&io->work, kcryptd_do_work); + INIT_WORK(&io->work, kcryptd_do_io); queue_work(cc->io_queue, &io->work); } @@ -541,7 +544,7 @@ static void clone_init(struct dm_crypt_i clone->bi_destructor = dm_crypt_bio_destructor; } -static void process_read(struct dm_crypt_io *io) +static void crypt_read_io(struct dm_crypt_io *io) { struct crypt_config *cc = io->target->private; struct bio *base_bio = io->base_bio; @@ -573,7 +576,15 @@ static void process_read(struct dm_crypt generic_make_request(clone); } -static void process_write(struct dm_crypt_io *io) +static void crypt_write_io(struct dm_crypt_io *io) +{ +} + +static void crypt_write_io_done(struct dm_crypt_io *io, int error) +{ +} + +static void crypt_write_io_process(struct dm_crypt_io *io) { struct crypt_config *cc = io->target->private; struct bio *base_bio = io->base_bio; @@ -631,7 +642,7 @@ static void process_write(struct dm_cryp } } -static void crypt_read_done(struct dm_crypt_io *io, int error) +static void crypt_read_io_done(struct dm_crypt_io *io, int error) { if (unlikely(error < 0)) io->error = -EIO; @@ -639,7 +650,7 @@ static void crypt_read_done(struct dm_cr crypt_dec_pending(io); } -static void process_read_endio(struct dm_crypt_io *io) +static void crypt_read_io_process(struct dm_crypt_io *io) { struct crypt_config *cc = io->target->private; int r = 0; @@ -649,15 +660,17 @@ static void process_read_endio(struct dm r = crypt_convert(cc, &io->ctx); - crypt_read_done(io, r); + crypt_read_io_done(io, r); } -static void kcryptd_do_work(struct work_struct *work) +static void kcryptd_do_io(struct work_struct *work) { struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work); if (bio_data_dir(io->base_bio) == READ) - process_read(io); + crypt_read_io(io); + else + crypt_write_io(io); } static void kcryptd_do_crypt(struct work_struct *work) @@ -665,9 +678,9 @@ static void kcryptd_do_crypt(struct work struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work); if (bio_data_dir(io->base_bio) == READ) - process_read_endio(io); + crypt_read_io_process(io); else - process_write(io); + crypt_write_io_process(io); } /*