diff options
| author | Neil Brown <neilb@notabene.brown> | 2008-07-08 02:11:50 +0200 |
|---|---|---|
| committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 02:11:50 +0200 |
| commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
| tree | a1f22225aace571661c29e59ebd024bc4619e054 /drivers/md | |
| parent | md: rationalize raid5 function names (diff) | |
| parent | Linux 2.6.26-rc9 (diff) | |
| download | linux-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.tar.xz linux-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/md')
| -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, case 0: atomic_dec(&ctx->pending); ctx->sector++; + cond_resched(); continue; /* error */ |