Commit 97d3b267 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Andrew Morton
Browse files

ocfs2: remove some useless functions 

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarJoseph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent cf069c3b

fs/ocfs2/heartbeat.c

+2 −19
Original line number Diff line number Diff line
@@ -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);

}