diff options
author | Sunil Mushran <sunil.mushran@oracle.com> | 2011-07-24 13:31:54 -0400 |
---|---|---|
committer | Sunil Mushran <sunil.mushran@oracle.com> | 2011-07-24 13:31:54 -0400 |
commit | bb570a5d9e74f71d32751823052db4a97d6a5e7c (patch) | |
tree | f8690b945d29e88d67bc55cd32656de73e13941d /fs/ocfs2 | |
parent | a2c0cc1579176bd0808ef7deea456767dfa80217 (diff) |
ocfs2/cluster: Fix output in file elapsed_time_in_ms
The o2hb debugfs file, elapsed_time_in_ms, should return values only after the
timer is armed atleast once.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 4728a746281d..a4e855e3690e 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
@@ -1198,6 +1198,7 @@ static int o2hb_debug_open(struct inode *inode, struct file *file) | |||
1198 | struct o2hb_debug_buf *db = inode->i_private; | 1198 | struct o2hb_debug_buf *db = inode->i_private; |
1199 | struct o2hb_region *reg; | 1199 | struct o2hb_region *reg; |
1200 | unsigned long map[BITS_TO_LONGS(O2NM_MAX_NODES)]; | 1200 | unsigned long map[BITS_TO_LONGS(O2NM_MAX_NODES)]; |
1201 | unsigned long lts; | ||
1201 | char *buf = NULL; | 1202 | char *buf = NULL; |
1202 | int i = -1; | 1203 | int i = -1; |
1203 | int out = 0; | 1204 | int out = 0; |
@@ -1234,9 +1235,11 @@ static int o2hb_debug_open(struct inode *inode, struct file *file) | |||
1234 | 1235 | ||
1235 | case O2HB_DB_TYPE_REGION_ELAPSED_TIME: | 1236 | case O2HB_DB_TYPE_REGION_ELAPSED_TIME: |
1236 | reg = (struct o2hb_region *)db->db_data; | 1237 | reg = (struct o2hb_region *)db->db_data; |
1237 | out += snprintf(buf + out, PAGE_SIZE - out, "%u\n", | 1238 | lts = reg->hr_last_timeout_start; |
1238 | jiffies_to_msecs(jiffies - | 1239 | /* If 0, it has never been set before */ |
1239 | reg->hr_last_timeout_start)); | 1240 | if (lts) |
1241 | lts = jiffies_to_msecs(jiffies - lts); | ||
1242 | out += snprintf(buf + out, PAGE_SIZE - out, "%lu\n", lts); | ||
1240 | goto done; | 1243 | goto done; |
1241 | 1244 | ||
1242 | case O2HB_DB_TYPE_REGION_PINNED: | 1245 | case O2HB_DB_TYPE_REGION_PINNED: |