Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dm crypt: remove inc_pending from write_io_submit

Browse source 
Make the caller reponsible for incrementing the pending count before calling
kcryptd_crypt_write_io_submit() in the non-async case to bring it into line
with the async case.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Alasdair G Kergon 2008-10-10 13:37:05 +01:00
parent fc5a5e9aa8
commit 1e37bb8e55
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/md/dm-crypt.c
View file

@ -685,10 +685,8 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io,
if (async) if (async)
kcryptd_queue_io(io); kcryptd_queue_io(io);
else { else
crypt_inc_pending(io);
generic_make_request(clone); generic_make_request(clone);
}
} }
static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
@ -724,9 +722,12 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
if (atomic_dec_and_test(&io->ctx.pending)) { if (atomic_dec_and_test(&io->ctx.pending)) {
/* processed, no running async crypto */ /* processed, no running async crypto */
crypt_inc_pending(io);
kcryptd_crypt_write_io_submit(io, r, 0); kcryptd_crypt_write_io_submit(io, r, 0);
if (unlikely(r < 0)) if (unlikely(r < 0)) {
crypt_dec_pending(io);
break; break;
}
} else } else
crypt_inc_pending(io); crypt_inc_pending(io);