From: nikita <nikita>
Date: Mon, 20 Nov 2006 06:25:38 +0000 (+0000)
Subject: log_do_checkpoint(): fix return value.
X-Git-Tag: v1_8_0_110~486^2~124
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e77d967891f828577c874d610189e3d4c8d76739;p=fs%2Flustre-release.git

log_do_checkpoint(): fix return value.
---

diff --git a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
index d28272d..183e27e 100644
--- a/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
+++ b/lustre/kernel_patches/patches/jbd-checkpoint-on-commit.patch
@@ -35,7 +35,7 @@ Index: linux/fs/jbd/checkpoint.c
  		tid_t this_tid;
  
  		transaction = journal->j_checkpoint_transactions;
-@@ -364,17 +374,19 @@ int log_do_checkpoint(journal_t *journal
+@@ -364,17 +374,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.
  		 */
@@ -45,6 +45,7 @@ Index: linux/fs/jbd/checkpoint.c
 +		J_ASSERT(drop_count != 0 || result != 0);
 +		if (result == -EAGAIN)
 +			break;
++		result = 0;
  		if (journal->j_checkpoint_transactions != transaction)
  			break;
  	}