From 354fedc8f64a0063a6932b44119056b818fa4857 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Mon, 18 Oct 2010 08:32:35 +0300
Subject: [PATCH] --- yaml --- r: 213015 b: refs/heads/master c:
 3601ba27353a968df843454e4b81155376682505 h: refs/heads/master i:   213013:
 3577d1239a25056aba3486498951320b91a91c33   213011:
 7d68faa83b1cca06cc94e7c1be4730445e448e56   213007:
 7c2192276b71e59af39118c3866953e71071458d v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ubifs/super.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 901bfb1ad862..fd291c3222c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39037559e651c417fb68b828926dc61cd5d6e5e2
+refs/heads/master: 3601ba27353a968df843454e4b81155376682505
diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c
index 6ff2f802bd7e..9a47c9f0ad07 100644
--- a/trunk/fs/ubifs/super.c
+++ b/trunk/fs/ubifs/super.c
@@ -1772,6 +1772,10 @@ static void ubifs_put_super(struct super_block *sb)
 				 */
 				ubifs_err("failed to write master node, "
 					  "error %d", err);
+		} else {
+			for (i = 0; i < c->jhead_cnt; i++)
+				/* Make sure write-buffer timers are canceled */
+				hrtimer_cancel(&c->jheads[i].wbuf.timer);
 		}
 	}