Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

cefcade9 · Linus Torvalds <[email protected]> · 2008-07-02 18:55:17 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
  dm crypt: use cond_resched

Merge commit. Changes below are compared with the first parent: c6b96d19.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/md/dm-crypt.c	modified	+1	−0	View file

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 835def1..ab6a61d 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 */