korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

dm crypt: tidy io ref counting

Browse Source 
Make io reference counting more obvious.

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2008-02-08 02:11:02 +00:00 committed by Alasdair G Kergon
parent 84131db689
commit 899c95d36c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/md/dm-crypt.c
View File

@ -584,7 +584,6 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int error)
crypt_free_buffer_pages(cc, clone); crypt_free_buffer_pages(cc, clone);
bio_put(clone); bio_put(clone);
io->error = -EIO; io->error = -EIO;
crypt_dec_pending(io);
return; return;
} }
@ -593,6 +592,9 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int error)
clone->bi_sector = cc->start + io->sector; clone->bi_sector = cc->start + io->sector;
io->sector += bio_sectors(clone); io->sector += bio_sectors(clone);
atomic_inc(&io->pending);
generic_make_request(clone);
} }
static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io) static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
@ -610,7 +612,6 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
clone = crypt_alloc_buffer(io, remaining); clone = crypt_alloc_buffer(io, remaining);
if (unlikely(!clone)) { if (unlikely(!clone)) {
io->error = -ENOMEM; io->error = -ENOMEM;
crypt_dec_pending(io);
return; return;
} }
@ -625,16 +626,6 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
if (unlikely(r < 0)) if (unlikely(r < 0))
return; return;
/* Grab another reference to the io struct
* before we kick off the request */
if (remaining)
atomic_inc(&io->pending);
generic_make_request(clone);
/* Do not reference clone after this - it
* may be gone already. */
/* out of memory -> run queues */ /* out of memory -> run queues */
if (unlikely(remaining)) if (unlikely(remaining))
congestion_wait(WRITE, HZ/100); congestion_wait(WRITE, HZ/100);
@ -645,10 +636,15 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
{ {
struct crypt_config *cc = io->target->private; struct crypt_config *cc = io->target->private;
/*
* Prevent io from disappearing until this function completes.
*/
atomic_inc(&io->pending); atomic_inc(&io->pending);
crypt_convert_init(cc, &io->ctx, NULL, io->base_bio, io->sector); crypt_convert_init(cc, &io->ctx, NULL, io->base_bio, io->sector);
kcryptd_crypt_write_convert_loop(io); kcryptd_crypt_write_convert_loop(io);
crypt_dec_pending(io);
} }
static void kcryptd_crypt_read_done(struct dm_crypt_io *io, int error) static void kcryptd_crypt_read_done(struct dm_crypt_io *io, int error)