2008-02-06 09:49:43

by Andrew Morton

[permalink] [raw]
Subject: [patch 248/260] BKL-removal: remove incorrect comment refering to lock_kernel() from jbd/jbd2

From: Andi Kleen <[email protected]>

None of the callers of this function does actually take the BKL as far as I
can see. So remove the comment refering to the BKL.

Signed-off-by: Andi Kleen <[email protected]>
Cc: <[email protected]>
Cc: Theodore Ts'o <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

fs/jbd/recovery.c | 2 +-
fs/jbd2/recovery.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/jbd/recovery.c~bkl-removal-remove-incorrect-comment-refering-to-lock_kernel-from-jbd-jbd2 fs/jbd/recovery.c
--- a/fs/jbd/recovery.c~bkl-removal-remove-incorrect-comment-refering-to-lock_kernel-from-jbd-jbd2
+++ a/fs/jbd/recovery.c
@@ -354,7 +354,7 @@ static int do_one_pass(journal_t *journa
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 -puN fs/jbd2/recovery.c~bkl-removal-remove-incorrect-comment-refering-to-lock_kernel-from-jbd-jbd2 fs/jbd2/recovery.c
--- a/fs/jbd2/recovery.c~bkl-removal-remove-incorrect-comment-refering-to-lock_kernel-from-jbd-jbd2
+++ a/fs/jbd2/recovery.c
@@ -397,7 +397,7 @@ static int do_one_pass(journal_t *journa
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
_