2022-07-19 10:40:35

by Christophe JAILLET

Subject: [PATCH 1/3] ocfs2: Remove some useless functions

__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 <[email protected]>
---
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);
}

--
2.34.1

2022-07-20 02:20:01

by Joseph Qi

Subject: Re: [PATCH 1/3] ocfs2: Remove some useless functions

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 <[email protected]>

Looks good.
Reviewed-by: Joseph Qi <[email protected]>

> ---
> 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);
> }
>