Commit cefcade9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm 

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
  dm crypt: use cond_resched
parents c6b96d19 c7f1b204

drivers/md/dm-crypt.c

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ static int crypt_convert(struct crypt_config *cc, 
		case 0:

			atomic_dec(&ctx->pending);

			ctx->sector++;

			cond_resched();

			continue;



		/* error */