aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/ubifs.h
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-06-23 05:30:43 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-07-05 11:45:16 -0400
commit0b335b9d7d5f0b832e90ac469480789c07be80ad (patch)
tree5001522f18092e1cafb538a74eedae3087c17145 /fs/ubifs/ubifs.h
parent70aee2f153972f70fad5f7025134fec063f9efbe (diff)
UBIFS: slightly optimize write-buffer timer usage
This patch adds the following minor optimization: 1. If write-buffer does not use the timer, indicate it with the wbuf->no_timer variable, instead of using the wbuf->softlimit variable. This is better because wbuf->softlimit is of ktime_t type, and the ktime_to_ns function contains 64-bit multiplication. 2. Do not call the 'hrtimer_cancel()' function for write-buffers which do not use timers. 3. Do not cancel the timer in 'ubifs_put_super()' because the synchronization function does this. This patch also removes a confusing comment. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/ubifs.h')
-rw-r--r--fs/ubifs/ubifs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1bf01d820066..97bc9d09d54b 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -654,7 +654,8 @@ typedef int (*ubifs_lpt_scan_callback)(struct ubifs_info *c,
654 * @delta: hard and soft timeouts delta (the timer expire inteval is @softlimit 654 * @delta: hard and soft timeouts delta (the timer expire inteval is @softlimit
655 * and @softlimit + @delta) 655 * and @softlimit + @delta)
656 * @timer: write-buffer timer 656 * @timer: write-buffer timer
657 * @need_sync: it is set if its timer expired and needs sync 657 * @no_timer: non-zero if this write-buffer does not timer
658 * @need_sync: non-zero if its timer expired and needs sync
658 * @next_ino: points to the next position of the following inode number 659 * @next_ino: points to the next position of the following inode number
659 * @inodes: stores the inode numbers of the nodes which are in wbuf 660 * @inodes: stores the inode numbers of the nodes which are in wbuf
660 * 661 *
@@ -683,7 +684,8 @@ struct ubifs_wbuf {
683 ktime_t softlimit; 684 ktime_t softlimit;
684 unsigned long long delta; 685 unsigned long long delta;
685 struct hrtimer timer; 686 struct hrtimer timer;
686 int need_sync; 687 unsigned int no_timer:1;
688 unsigned int need_sync:1;
687 int next_ino; 689 int next_ino;
688 ino_t *inodes; 690 ino_t *inodes;
689}; 691};