Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / fs / jbd / recovery.c

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index c5d9694b6a2ff2df7f9311942674321c05147c88..2b8edf4d6eaa6462c59f055f81017954d92b0e39 100644 (file)
--- a/fs/jbd/recovery.c
+++ b/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