Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e37bb8e authored by Alasdair G Kergon's avatar Alasdair G Kergon
Browse files

dm crypt: remove inc_pending from write_io_submit 



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: default avatarAlasdair G Kergon <agk@redhat.com>
parent fc5a5e9a

drivers/md/dm-crypt.c

+5 −4
Original line number Diff line number Diff line
@@ -685,11 +685,9 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, 


	if (async)

		kcryptd_queue_io(io);

	else {

		crypt_inc_pending(io);

	else

		generic_make_request(clone);

}

}



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)) {

			/* processed, no running async crypto  */

			crypt_inc_pending(io);

			kcryptd_crypt_write_io_submit(io, r, 0);

			if (unlikely(r < 0))

			if (unlikely(r < 0)) {

				crypt_dec_pending(io);

				break;

			}

		} else

			crypt_inc_pending(io);