summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 18:55:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 18:55:17 -0700
commitcefcade9e7b2331110fdd709b5871ebcc5f9a40f (patch)
treed70257c00c11ae2c4aa4b045d03d2e73dcd7c1d7
parentc6b96d195a0fd132d6e8c783216d1d3f686e5ba8 (diff)
parentc7f1b2044191a82e7f0a1a674751ed582289e2e0 (diff)
downloadlinux-cefcade9e7b2331110fdd709b5871ebcc5f9a40f.tar.bz2
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
-rw-r--r--drivers/md/dm-crypt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 835def11419d..ab6a61db63ce 100644
--- 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 */