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

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
cefcade9 · Linus Torvalds · c6b96d19 · c7f1b204 · cefcade9
Commit cefcade9 authored Jul 02, 2008 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/md/dm-crypt.c drivers/md/dm-crypt.c +1 -0

No files found.
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -432,6 +432,7 @@ static int crypt_convert(struct crypt_config *cc,
 		case 0:
 			atomic_dec(&ctx->pending);
 			ctx->sector++;
+			cond_resched();
 			continue;
 		/* error */