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

Commit 6c031f41 authored by Milan Broz's avatar Milan Broz Committed by Alasdair G Kergon
Browse files

dm crypt: move dec_pending on error into write_io_submit 



Make kcryptd_crypt_write_io_submit() responsible for decrementing
the pending count after an error.

Also fixes a bug in the async path that forgot to decrement it.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 1e37bb8e

drivers/md/dm-crypt.c

+2 −3
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, 
		crypt_free_buffer_pages(cc, clone);

		bio_put(clone);

		io->error = -EIO;

		crypt_dec_pending(io);

		return;

	}
@@ -724,10 +725,8 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) 
			/* processed, no running async crypto  */

			crypt_inc_pending(io);

			kcryptd_crypt_write_io_submit(io, r, 0);

			if (unlikely(r < 0)) {

				crypt_dec_pending(io);

			if (unlikely(r < 0))

				break;

			}

		} else

			crypt_inc_pending(io);