From 04fd807390a5ad90248a364f6f0795f3bc9caa9d Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 30 Nov 2006 10:18:53 +0000 Subject: [PATCH] another return value fix. --- lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch index b459eb2..2ee1829 100644 --- a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch +++ b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch @@ -26,7 +26,15 @@ Index: linux/fs/jbd/checkpoint.c int batch_count = 0; struct buffer_head *bhs[NR_BATCH]; -@@ -314,7 +324,7 @@ int log_do_checkpoint(journal_t *journal +@@ -300,6 +310,7 @@ int log_do_checkpoint(journal_t *journal + jbd_debug(1, "cleanup_journal_tail returned %d\n", result); + if (result <= 0) + return result; ++ result = 0; + + /* + * OK, we need to start writing disk blocks. Try to free up a +@@ -314,7 +325,7 @@ int log_do_checkpoint(journal_t *journal transaction_t *transaction; struct journal_head *jh, *last_jh, *next_jh; int drop_count = 0; @@ -35,7 +43,7 @@ Index: linux/fs/jbd/checkpoint.c tid_t this_tid; transaction = journal->j_checkpoint_transactions; -@@ -364,17 +374,20 @@ int log_do_checkpoint(journal_t *journal +@@ -364,17 +375,20 @@ int log_do_checkpoint(journal_t *journal * finding anything to write to disk. We had better be * able to make some progress or we are in trouble. */ -- 1.8.3.1