From 53b23f994569dfc99cbd6058689a422f9614e8bc Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 6 Feb 2008 01:40:11 -0800 Subject: [PATCH] --- yaml --- r: 83615 b: refs/heads/master c: e86e14385d8473a71809ff5c2be4b06867af4b5e h: refs/heads/master i: 83613: d2940413cd9f39d82b1da48beac1569392444e71 83611: aa2a69783d62e38b50c75ea7f4019eb0c15936ed 83607: c2cf6d66019d639a6f2e73e25e0a3d1257ae4007 83599: a4e04e8793b7e7c9d9644b428bfb9fffb323b5ac 83583: 255167bed4992f028cbd8ec78312ddcd7fa3b417 v: v3 --- [refs] | 2 +- trunk/fs/jbd/recovery.c | 2 +- trunk/fs/jbd2/recovery.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 058ec461557b..ef8d9bec6868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d71cadd6bc9834710c0b045e3abedd0c56ff1c37 +refs/heads/master: e86e14385d8473a71809ff5c2be4b06867af4b5e diff --git a/trunk/fs/jbd/recovery.c b/trunk/fs/jbd/recovery.c index c5d9694b6a2f..2b8edf4d6eaa 100644 --- a/trunk/fs/jbd/recovery.c +++ b/trunk/fs/jbd/recovery.c @@ -354,7 +354,7 @@ static int do_one_pass(journal_t *journal, struct buffer_head * obh; struct buffer_head * nbh; - cond_resched(); /* We're under lock_kernel() */ + cond_resched(); /* If we already know where to stop the log traversal, * check right now that we haven't gone past the end of diff --git a/trunk/fs/jbd2/recovery.c b/trunk/fs/jbd2/recovery.c index 921680663fa2..d36356f7d222 100644 --- a/trunk/fs/jbd2/recovery.c +++ b/trunk/fs/jbd2/recovery.c @@ -397,7 +397,7 @@ static int do_one_pass(journal_t *journal, struct buffer_head * obh; struct buffer_head * nbh; - cond_resched(); /* We're under lock_kernel() */ + cond_resched(); /* If we already know where to stop the log traversal, * check right now that we haven't gone past the end of