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