From bd6dd1032e5ac7f73f20436d1d081091c92353a0 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Thu, 11 Sep 2008 14:25:44 +0300
Subject: [PATCH] --- yaml --- r: 116207 b: refs/heads/master c:
 bed79935de9a658678f44b88a097367d3b26429f h: refs/heads/master i:   116205:
 dff74a02a5caa312c03cee5cb38c09e052162e92   116203:
 bb51eb00db304e6d1cb548d70fe083d92520d479   116199:
 c2f1559c02432d08edc3b25befa4ce4b19c433e9   116191:
 189ce53efda5eafc1f5da6a2d9712b806f66dd68 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ubifs/super.c | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 59620b9a59b4..c3a068962422 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403e12ab30ab160e1015bd998f0abc1865c574e0
+refs/heads/master: bed79935de9a658678f44b88a097367d3b26429f
diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c
index 7e1f3efdf632..7fd759dde796 100644
--- a/trunk/fs/ubifs/super.c
+++ b/trunk/fs/ubifs/super.c
@@ -420,21 +420,22 @@ static int ubifs_sync_fs(struct super_block *sb, int wait)
 	int i, ret = 0, err;
 	long long bud_bytes;
 
-	if (c->jheads)
+	if (c->jheads) {
 		for (i = 0; i < c->jhead_cnt; i++) {
 			err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
 			if (err && !ret)
 				ret = err;
 		}
 
-	/* Commit the journal unless it has too few data */
-	spin_lock(&c->buds_lock);
-	bud_bytes = c->bud_bytes;
-	spin_unlock(&c->buds_lock);
-	if (bud_bytes > c->leb_size) {
-		err = ubifs_run_commit(c);
-		if (err)
-			return err;
+		/* Commit the journal unless it has too little data */
+		spin_lock(&c->buds_lock);
+		bud_bytes = c->bud_bytes;
+		spin_unlock(&c->buds_lock);
+		if (bud_bytes > c->leb_size) {
+			err = ubifs_run_commit(c);
+			if (err)
+				return err;
+		}
 	}
 
 	/*