[Ocfs2-commits] mfasheh commits r2976 - branches/ocfs2-1.2/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2007-01-29 15:41:29 -0800 (Mon, 29 Jan 2007)
New Revision: 2976

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c
Log:
ocfs2_dlm: make tot_backoff more descriptive

Characters are cheap. This keeps things in sync with the mainline commit.

Signed-off-by: jlbec


Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c	2007-01-29 23:28:09 UTC (rev 2975)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c	2007-01-29 23:41:29 UTC (rev 2976)
@@ -1247,7 +1247,7 @@
 {
 	int status;
 	unsigned int backoff;
-	unsigned int tot_backoff = 0;
+	unsigned int total_backoff = 0;
 
 	BUG_ON(!dlm);
 
@@ -1291,12 +1291,12 @@
 				goto bail;
 			}
 
-			if (tot_backoff >
+			if (total_backoff >
 			    msecs_to_jiffies(DLM_JOIN_TIMEOUT_MSECS)) {
 				status = -ERESTARTSYS;
 				mlog(ML_NOTICE, "Timed out joining dlm domain "
 				     "%s after %u msecs\n", dlm->name,
-				     jiffies_to_msecs(tot_backoff));
+				     jiffies_to_msecs(total_backoff));
 				goto bail;
 			}
 
@@ -1309,7 +1309,7 @@
 			 */
 			backoff = (unsigned int)(jiffies & 0x3);
 			backoff *= DLM_DOMAIN_BACKOFF_MS;
-			tot_backoff += backoff;
+			total_backoff += backoff;
 			mlog(0, "backoff %d\n", backoff);
 			msleep(backoff);
 		}