From 54a3a9b135b773930f5ce1c3603bab31592cde7a Mon Sep 17 00:00:00 2001
From: nikita <nikita>
Date: Wed, 29 Nov 2006 19:09:54 +0000
Subject: [PATCH] log_do_checkpoint(): fix return value.

---
 lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
index 367ba3f..b459eb2 100644
--- a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
+++ b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
@@ -54,7 +54,7 @@ Index: linux/fs/jbd/checkpoint.c
 -	if (result < 0)
 -		return result;
 +	result2 = cleanup_journal_tail(journal);
-+	if (result == 0)
++	if (result == 0 && result2 < 0)
 +		result = result2;
  
 -	return 0;
-- 
1.8.3.1