X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fjbd%2Frecovery.c;h=103c34e4fb280978873cd811ef06d34c01bab2c2;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=4a3d494a35743583162fd8d9c00d8cf810698eeb;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 4a3d494a3..103c34e4f 100644
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -354,6 +354,8 @@ static int do_one_pass(journal_t *journal,
 		struct buffer_head *	obh;
 		struct buffer_head *	nbh;
 
+		cond_resched();		/* We're under lock_kernel() */
+
 		/* If we already know where to stop the log traversal,
 		 * check right now that we haven't gone past the end of
 		 * the log. */