git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
fs
/
jbd
/
checkpoint.c
diff --git
a/fs/jbd/checkpoint.c
b/fs/jbd/checkpoint.c
index
98d8304
..
5a97e34
100644
(file)
--- a/
fs/jbd/checkpoint.c
+++ b/
fs/jbd/checkpoint.c
@@
-188,7
+188,6
@@
static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
} else {
jbd_unlock_bh_state(bh);
}
} else {
jbd_unlock_bh_state(bh);
}
- jh = next_jh;
} while (jh != last_jh);
return ret;
} while (jh != last_jh);
return ret;
@@
-339,8
+338,10
@@
int log_do_checkpoint(journal_t *journal)
}
} while (jh != last_jh && !retry);
}
} while (jh != last_jh && !retry);
- if (batch_count)
+ if (batch_count)
{
__flush_batch(journal, bhs, &batch_count);
__flush_batch(journal, bhs, &batch_count);
+ retry = 1;
+ }
/*
* If someone cleaned up this transaction while we slept, we're
/*
* If someone cleaned up this transaction while we slept, we're