| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Subject: ocfs2: remove some useless functions |
| Date: Thu, 21 Jul 2022 22:49:25 +0200 |
| |
| Patch series "ocfs2: A few clean_ups", v2. |
| |
| __ocfs2_node_map_set_bit() and __ocfs2_node_map_clear_bit() are just |
| wrapper around set_bit() and clear_bit(). |
| |
| The leading __ also makes think that these functions are non-atomic just |
| like __set_bit() and __clear_bit(). |
| |
| So, just remove these wrappers and call set_bit() and clear_bit() |
| directly. |
| |
| Link: https://lkml.kernel.org/r/cover.1658436259.git.christophe.jaillet@wanadoo.fr |
| Link: https://lkml.kernel.org/r/bd1429c84ec7d174c96dbb67a2b42b1b456d9394.1658436259.git.christophe.jaillet@wanadoo.fr |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Cc: Mark Fasheh <mark@fasheh.com> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: Junxiao Bi <junxiao.bi@oracle.com> |
| Cc: Changwei Ge <gechangwei@live.cn> |
| Cc: Gang He <ghe@suse.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/ocfs2/heartbeat.c | 21 ++------------------- |
| 1 file changed, 2 insertions(+), 19 deletions(-) |
| |
| --- a/fs/ocfs2/heartbeat.c~ocfs2-remove-some-useless-functions |
| +++ a/fs/ocfs2/heartbeat.c |
| @@ -24,11 +24,6 @@ |
| |
| #include "buffer_head_io.h" |
| |
| -static inline void __ocfs2_node_map_set_bit(struct ocfs2_node_map *map, |
| - int bit); |
| -static inline void __ocfs2_node_map_clear_bit(struct ocfs2_node_map *map, |
| - int bit); |
| - |
| /* special case -1 for now |
| * TODO: should *really* make sure the calling func never passes -1!! */ |
| static void ocfs2_node_map_init(struct ocfs2_node_map *map) |
| @@ -65,12 +60,6 @@ void ocfs2_do_node_down(int node_num, vo |
| ocfs2_recovery_thread(osb, node_num); |
| } |
| |
| -static inline void __ocfs2_node_map_set_bit(struct ocfs2_node_map *map, |
| - int bit) |
| -{ |
| - set_bit(bit, map->map); |
| -} |
| - |
| void ocfs2_node_map_set_bit(struct ocfs2_super *osb, |
| struct ocfs2_node_map *map, |
| int bit) |
| @@ -79,16 +68,10 @@ void ocfs2_node_map_set_bit(struct ocfs2 |
| return; |
| BUG_ON(bit >= map->num_nodes); |
| spin_lock(&osb->node_map_lock); |
| - __ocfs2_node_map_set_bit(map, bit); |
| + set_bit(bit, map->map); |
| spin_unlock(&osb->node_map_lock); |
| } |
| |
| -static inline void __ocfs2_node_map_clear_bit(struct ocfs2_node_map *map, |
| - int bit) |
| -{ |
| - clear_bit(bit, map->map); |
| -} |
| - |
| void ocfs2_node_map_clear_bit(struct ocfs2_super *osb, |
| struct ocfs2_node_map *map, |
| int bit) |
| @@ -97,7 +80,7 @@ void ocfs2_node_map_clear_bit(struct ocf |
| return; |
| BUG_ON(bit >= map->num_nodes); |
| spin_lock(&osb->node_map_lock); |
| - __ocfs2_node_map_clear_bit(map, bit); |
| + clear_bit(bit, map->map); |
| spin_unlock(&osb->node_map_lock); |
| } |
| |
| _ |