diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-10-18 08:28:50 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-10-21 11:15:18 +0300 |
| commit | 39037559e651c417fb68b828926dc61cd5d6e5e2 (patch) | |
| tree | 4b014d5e625c42cda030b4711186ee3ba381396b /fs/ubifs | |
| parent | 7d08ae3c9205b559f90c3d7a3abba3c6479673c7 (diff) | |
| download | linux-stable-39037559e651c417fb68b828926dc61cd5d6e5e2.tar.gz linux-stable-39037559e651c417fb68b828926dc61cd5d6e5e2.tar.bz2 linux-stable-39037559e651c417fb68b828926dc61cd5d6e5e2.zip | |
UBIFS: remove a bit of unneeded code
This is a clean-up patch which:
1. Removes explicite 'hrtimer_cancel()' after 'ubifs_wbuf_sync()' in
'ubifs_remount_ro()', because the timers will be canceled by
'ubifs_wbuf_sync()', no need to cancel them for the second time.
2. Remove "if (c->jheads)" check from 'ubifs_put_super()', because
at journal heads must always be allocated there, since we checked
earlier that we were mounted R/W, and the olny situation when
journal heads are not allocated is when mounter or re-mounted R/O.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/super.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index bb6ed5da2d10..6ff2f802bd7e 100644 --- a/fs/ubifs/super.c +++ b/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 |