summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaojun <piaojun@huawei.com>2017-11-15 20:31:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 21:21:01 -0500
commit98d6c09ec2899a9a601b16ec7ae31d54e6b100b9 (patch)
tree975c12f971ef00338a6957b740fa0fe5d4fdaa35
parent23e0813a0807754b5be18688b7564c58e0eb2f2a (diff)
ocfs2: cleanup unused func declaration and assignment
Link: http://lkml.kernel.org/r/59E064BB.8000005@huawei.com Signed-off-by: Jun Piao <piaojun@huawei.com> Reviewed-by: Joseph Qi <jiangqi903@gmail.com> Cc: Mark Fasheh <mfasheh@versity.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ocfs2/alloc.c2
-rw-r--r--fs/ocfs2/cluster/heartbeat.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index addd7c5f2d3e..ab5105f9767e 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -3585,8 +3585,6 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
3585 * The easy case - we can just plop the record right in. 3585 * The easy case - we can just plop the record right in.
3586 */ 3586 */
3587 *left_rec = *split_rec; 3587 *left_rec = *split_rec;
3588
3589 has_empty_extent = 0;
3590 } else 3588 } else
3591 le16_add_cpu(&left_rec->e_leaf_clusters, split_clusters); 3589 le16_add_cpu(&left_rec->e_leaf_clusters, split_clusters);
3592 3590
diff --git a/fs/ocfs2/cluster/heartbeat.h b/fs/ocfs2/cluster/heartbeat.h
index 3ef5137dc362..a9e67efc0004 100644
--- a/fs/ocfs2/cluster/heartbeat.h
+++ b/fs/ocfs2/cluster/heartbeat.h
@@ -79,10 +79,8 @@ void o2hb_fill_node_map(unsigned long *map,
79 unsigned bytes); 79 unsigned bytes);
80void o2hb_exit(void); 80void o2hb_exit(void);
81int o2hb_init(void); 81int o2hb_init(void);
82int o2hb_check_node_heartbeating(u8 node_num);
83int o2hb_check_node_heartbeating_no_sem(u8 node_num); 82int o2hb_check_node_heartbeating_no_sem(u8 node_num);
84int o2hb_check_node_heartbeating_from_callback(u8 node_num); 83int o2hb_check_node_heartbeating_from_callback(u8 node_num);
85int o2hb_check_local_node_heartbeating(void);
86void o2hb_stop_all_regions(void); 84void o2hb_stop_all_regions(void);
87int o2hb_get_all_regions(char *region_uuids, u8 numregions); 85int o2hb_get_all_regions(char *region_uuids, u8 numregions);
88int o2hb_global_heartbeat_active(void); 86int o2hb_global_heartbeat_active(void);