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);
 		}
 	}