Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83615
b: refs/heads/master
c: e86e143
h: refs/heads/master
i:
  83613: d294041
  83611: aa2a697
  83607: c2cf6d6
  83599: a4e04e8
  83583: 255167b
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Feb 6, 2008
1 parent c85b542 commit 53b23f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d71cadd6bc9834710c0b045e3abedd0c56ff1c37
refs/heads/master: e86e14385d8473a71809ff5c2be4b06867af4b5e
2 changes: 1 addition & 1 deletion trunk/fs/jbd/recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/jbd2/recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53b23f9

Please sign in to comment.