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
git-mirror · Jul 3, 2008 · cefcade · cefcade
2 parents c6b96d1 + c7f1b20
commit cefcade
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 */