Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221695
b: refs/heads/master
c: b2c78cd
h: refs/heads/master
i:
  221693: 997a0d3
  221691: 575f124
  221687: 63cb9af
  221679: d645a40
  221663: 3294a30
  221631: 19b12be
  221567: 372b9b0
  221439: 8c565d6
  221183: 38fc392
v: v3
  • Loading branch information
Theodore Ts'o committed Nov 2, 2010
1 parent d1133ee commit b5656fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 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: f4245bd4ebf903541ba758ad06c118626d8c6f18
refs/heads/master: b2c78cd09b6ef78c8f20190f0b3e6df1d3651b70
14 changes: 6 additions & 8 deletions trunk/fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,6 @@ static int ext4_lazyinit_thread(void *arg)
struct ext4_li_request *elr;
unsigned long next_wakeup;
DEFINE_WAIT(wait);
int ret;

BUG_ON(NULL == eli);

Expand All @@ -2723,13 +2722,12 @@ static int ext4_lazyinit_thread(void *arg)
elr = list_entry(pos, struct ext4_li_request,
lr_request);

if (time_after_eq(jiffies, elr->lr_next_sched))
ret = ext4_run_li_request(elr);

if (ret) {
ret = 0;
ext4_remove_li_request(elr);
continue;
if (time_after_eq(jiffies, elr->lr_next_sched)) {
if (ext4_run_li_request(elr) != 0) {
/* error, remove the lazy_init job */
ext4_remove_li_request(elr);
continue;
}
}

if (time_before(elr->lr_next_sched, next_wakeup))
Expand Down

0 comments on commit b5656fa

Please sign in to comment.