diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/jbd/recovery.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/jbd/recovery.c')
| -rw-r--r-- | fs/jbd/recovery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index c5d9694b6a2f..2b8edf4d6eaa 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
| @@ -354,7 +354,7 @@ static int do_one_pass(journal_t *journal, | |||
| 354 | struct buffer_head * obh; | 354 | struct buffer_head * obh; |
| 355 | struct buffer_head * nbh; | 355 | struct buffer_head * nbh; |
| 356 | 356 | ||
| 357 | cond_resched(); /* We're under lock_kernel() */ | 357 | cond_resched(); |
| 358 | 358 | ||
| 359 | /* If we already know where to stop the log traversal, | 359 | /* If we already know where to stop the log traversal, |
| 360 | * check right now that we haven't gone past the end of | 360 | * check right now that we haven't gone past the end of |