Skip to content

Commit

Permalink
UBIFS: remove a bit of unneeded code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed Oct 21, 2010
1 parent 7d08ae3 commit 3903755
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions fs/ubifs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3903755

Please sign in to comment.