From b5656fafc1b8fd2a08b51f138033a12144491414 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 2 Nov 2010 14:19:30 -0400 Subject: [PATCH] --- yaml --- r: 221695 b: refs/heads/master c: b2c78cd09b6ef78c8f20190f0b3e6df1d3651b70 h: refs/heads/master i: 221693: 997a0d3bd6dc9236efb37fee24fa114d356e97af 221691: 575f1247ed7def4bd8c39b84643a2ffc9efcceb1 221687: 63cb9af1bdc0c3c52a27ae0b6a13ba04c2549796 221679: d645a40501dc437266bae9b26a688c6d21129528 221663: 3294a30d64f871ad830b69b7ca6b6c2a33e347b3 221631: 19b12beb28aea10e01468d09634a86e5cb72e9b0 221567: 372b9b0da3985b20d524335fa12b2c6e733f6a1a 221439: 8c565d67635e72e770f3dd9dd188f13449d6e0d7 221183: 38fc39228d667d1b068c4364c02104ea78be4a94 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f5a66f9aec7a..e1605560adf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4245bd4ebf903541ba758ad06c118626d8c6f18 +refs/heads/master: b2c78cd09b6ef78c8f20190f0b3e6df1d3651b70 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 8d1d9423ce9a..4d7ef31eacb1 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -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); @@ -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))