From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 22 May 2014 00:42:31 +0000 (+1000)
Subject: ocfs2-limit-printk-when-journal-is-aborted-fix
X-Git-Tag: next-20140530~2^2~432
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0e056c071361845dd2d60e254ad42d89d423eeec;p=karo-tx-linux.git

ocfs2-limit-printk-when-journal-is-aborted-fix

document the msleep

Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 2896220fd143..4b0c68849b36 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -2193,6 +2193,11 @@ static int ocfs2_commit_thread(void *arg)
 			if (printk_timed_ratelimit(&abort_warn_time, 60*HZ))
 				mlog(ML_ERROR, "status = %d, journal is "
 						"already aborted.\n", status);
+			/*
+			 * After ocfs2_commit_cache() fails, j_num_trans has a
+			 * non-zero value.  Sleep here to avoid a busy-wait
+			 * loop.
+			 */
 			msleep_interruptible(1000);
 		}