From f52fecf6a0e58ba3e3160249acd1b2276c575990 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 20 Oct 2007 01:14:21 +0100 Subject: [PATCH] --- yaml --- r: 71735 b: refs/heads/master c: 80fd662683be5dc2a3b41b27e30942d5fd7b5d5c h: refs/heads/master i: 71733: adefd163484dbd930e95c8b8f7e07313b13031c9 71731: 88147f314c6237be119bea9dd239b250378d7835 71727: f953a03e48d4e4fadd890457b6aa0eafdd314ddf v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-crypt.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9b94f9d12fd1..a6d7f1d0b7b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b15546f942c09fe55ad55af31841eecacbf4ffd1 +refs/heads/master: 80fd662683be5dc2a3b41b27e30942d5fd7b5d5c diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c index 64ffa0ea8ca4..b41f945df8a1 100644 --- a/trunk/drivers/md/dm-crypt.c +++ b/trunk/drivers/md/dm-crypt.c @@ -460,7 +460,7 @@ static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone) * One of the bios was finished. Check for completion of * the whole request and correctly clean up the buffer. */ -static void dec_pending(struct dm_crypt_io *io, int error) +static void crypt_dec_pending(struct dm_crypt_io *io, int error) { struct crypt_config *cc = (struct crypt_config *) io->target->private; @@ -533,7 +533,7 @@ static void crypt_endio(struct bio *clone, int error) out: bio_put(clone); - dec_pending(io, error); + crypt_dec_pending(io, error); } static void clone_init(struct dm_crypt_io *io, struct bio *clone) @@ -563,7 +563,7 @@ static void process_read(struct dm_crypt_io *io) */ clone = bio_alloc_bioset(GFP_NOIO, bio_segments(base_bio), cc->bs); if (unlikely(!clone)) { - dec_pending(io, -ENOMEM); + crypt_dec_pending(io, -ENOMEM); return; } @@ -598,7 +598,7 @@ static void process_write(struct dm_crypt_io *io) while (remaining) { clone = crypt_alloc_buffer(io, remaining); if (unlikely(!clone)) { - dec_pending(io, -ENOMEM); + crypt_dec_pending(io, -ENOMEM); return; } @@ -608,7 +608,7 @@ static void process_write(struct dm_crypt_io *io) if (unlikely(crypt_convert(cc, &ctx) < 0)) { crypt_free_buffer_pages(cc, clone); bio_put(clone); - dec_pending(io, -EIO); + crypt_dec_pending(io, -EIO); return; } @@ -643,7 +643,7 @@ static void process_read_endio(struct dm_crypt_io *io) crypt_convert_init(cc, &ctx, io->base_bio, io->base_bio, io->base_bio->bi_sector - io->target->begin, 0); - dec_pending(io, crypt_convert(cc, &ctx)); + crypt_dec_pending(io, crypt_convert(cc, &ctx)); } static void kcryptd_do_work(struct work_struct *work)