| Message ID | bd6796635e58f9c47cf857573c3b9474a00ce26a.1658224839.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] ocfs2: Remove some useless functions | expand |
On 7/19/22 6:01 PM, Christophe JAILLET wrote: > __ocfs2_node_map_set_bit() and __ocfs2_node_map_set_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. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Looks good. Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> > --- > fs/ocfs2/heartbeat.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) > > diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c > index 9099d8fc7599..1d72e0788943 100644 > --- a/fs/ocfs2/heartbeat.c > +++ b/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, void *data) > 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_super *osb, > 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 ocfs2_super *osb, > 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); > } >
diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c index 9099d8fc7599..1d72e0788943 100644 --- a/fs/ocfs2/heartbeat.c +++ b/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, void *data) 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_super *osb, 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 ocfs2_super *osb, 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); }
__ocfs2_node_map_set_bit() and __ocfs2_node_map_set_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. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- fs/ocfs2/heartbeat.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)