diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
| commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
| tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /drivers/md/dm-crypt.c | |
| parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tracing/mmiotrace
Diffstat (limited to 'drivers/md/dm-crypt.c')
| -rw-r--r-- | drivers/md/dm-crypt.c | 1 |
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 */ |