aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeil Brown <neilb@notabene.brown>2008-07-07 20:11:50 -0400
committerNeil Brown <neilb@notabene.brown>2008-07-07 20:11:50 -0400
commit5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch)
treea1f22225aace571661c29e59ebd024bc4619e054 /drivers/md
parent1fe797e67fb07d605b82300934d0de67068a0aca (diff)
parentb7279469d66b55119784b8b9529c99c1955fe747 (diff)
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/md')
-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,
432 case 0: 432 case 0:
433 atomic_dec(&ctx->pending); 433 atomic_dec(&ctx->pending);
434 ctx->sector++; 434 ctx->sector++;
435 cond_resched();
435 continue; 436 continue;
436 437
437 /* error */ 438 /* error */