From 3a9b9796da7c7fe3e0cdfe47d54e914bb02ce520 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 18 Oct 2010 08:28:50 +0300 Subject: [PATCH] --- yaml --- r: 213014 b: refs/heads/master c: 39037559e651c417fb68b828926dc61cd5d6e5e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ubifs/super.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9bb5db9fbb1a..901bfb1ad862 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d08ae3c9205b559f90c3d7a3abba3c6479673c7 +refs/heads/master: 39037559e651c417fb68b828926dc61cd5d6e5e2 diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c index bb6ed5da2d10..6ff2f802bd7e 100644 --- a/trunk/fs/ubifs/super.c +++ b/trunk/fs/ubifs/super.c @@ -1686,10 +1686,8 @@ static void ubifs_remount_ro(struct ubifs_info *c) dbg_save_space_info(c); - for (i = 0; i < c->jhead_cnt; i++) { + for (i = 0; i < c->jhead_cnt; i++) ubifs_wbuf_sync(&c->jheads[i].wbuf); - hrtimer_cancel(&c->jheads[i].wbuf.timer); - } c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY); c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS); @@ -1754,9 +1752,8 @@ static void ubifs_put_super(struct super_block *sb) int err; /* Synchronize write-buffers */ - if (c->jheads) - for (i = 0; i < c->jhead_cnt; i++) - ubifs_wbuf_sync(&c->jheads[i].wbuf); + for (i = 0; i < c->jhead_cnt; i++) + ubifs_wbuf_sync(&c->jheads[i].wbuf); /* * We are being cleanly unmounted which means the