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

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

Linus Torvalds 17 years ago

parent

c6b96d195a c7f1b20441

commit

cefcade9e7

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
drivers/md/dm-crypt.c
							 
								View File
							
				@@ -432,6 +432,7 @@ static int crypt_convert(struct crypt_config *cc,
			
				 		case 0:
			
				 			atomic_dec(&ctx->pending);
			
				 			ctx->sector++;
			
				+			cond_resched();
			
				 			continue;
			
				 		/* error */