Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f651ed authored by Jie Liu's avatar Jie Liu Committed by Linus Torvalds
Browse files

ocfs2: consolidate o2hb_global_hearbeat_mode_set() naming convention 



s/o2hb_global_hearbeat_mode_set/o2hb_global_heartbeat_mode_set/ to make
the signature of those routines in a consistent manner with others for
heartbeating.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Acked-by: default avatarSunil Mushran <sunil.mushran@gmail.com>
Cc: Gurudas Pai <gurudas.pai@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
Cc: Srinivas Eeeda <srinivas.eeda@oracle.com>
Cc: Tao Ma <tm@tao.ma>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e873fdb5

fs/ocfs2/cluster/heartbeat.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static void o2hb_dead_threshold_set(unsigned int threshold) 
	}

	}

}

}





static int o2hb_global_hearbeat_mode_set(unsigned int hb_mode)

static int o2hb_global_heartbeat_mode_set(unsigned int hb_mode)

{

{

	int ret = -1;

	int ret = -1;
@@ -2271,7 +2271,7 @@ ssize_t o2hb_heartbeat_group_mode_store(struct o2hb_heartbeat_group *group, 
		if (strnicmp(page, o2hb_heartbeat_mode_desc[i], len))

		if (strnicmp(page, o2hb_heartbeat_mode_desc[i], len))

			continue;

			continue;





		ret = o2hb_global_hearbeat_mode_set(i);

		ret = o2hb_global_heartbeat_mode_set(i);

		if (!ret)

		if (!ret)

			printk(KERN_NOTICE "o2hb: Heartbeat mode set to %s\n",

			printk(KERN_NOTICE "o2hb: Heartbeat mode set to %s\n",

			       o2hb_heartbeat_mode_desc[i]);

			       o2hb_heartbeat_mode_desc[i]);
@@ -2304,7 +2304,7 @@ static struct configfs_attribute *o2hb_heartbeat_group_attrs[] = { 
	NULL,

	NULL,

};

};





static struct configfs_item_operations o2hb_hearbeat_group_item_ops = {

static struct configfs_item_operations o2hb_heartbeat_group_item_ops = {

	.show_attribute		= o2hb_heartbeat_group_show,

	.show_attribute		= o2hb_heartbeat_group_show,

	.store_attribute	= o2hb_heartbeat_group_store,

	.store_attribute	= o2hb_heartbeat_group_store,

};

};
@@ -2316,7 +2316,7 @@ static struct configfs_group_operations o2hb_heartbeat_group_group_ops = { 




static struct config_item_type o2hb_heartbeat_group_type = {

static struct config_item_type o2hb_heartbeat_group_type = {

	.ct_group_ops	= &o2hb_heartbeat_group_group_ops,

	.ct_group_ops	= &o2hb_heartbeat_group_group_ops,

	.ct_item_ops	= &o2hb_hearbeat_group_item_ops,

	.ct_item_ops	= &o2hb_heartbeat_group_item_ops,

	.ct_attrs	= o2hb_heartbeat_group_attrs,

	.ct_attrs	= o2hb_heartbeat_group_attrs,

	.ct_owner	= THIS_MODULE,

	.ct_owner	= THIS_MODULE,

};

};