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

Commit 372a447c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Linus Torvalds
Browse files

ocfs2: do not log twice error messages 



'o2hb_map_slot_data' and 'o2hb_populate_slot_data' are called from only
one place, in 'o2hb_region_dev_write'.  Return value is checked and
'mlog_errno' is called to log a message if it is not 0.

So there is no need to call 'mlog_errno' directly within these functions.
This would result on logging the message twice.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent acf8fdbe

fs/ocfs2/cluster/heartbeat.c

+5 −15
Original line number Diff line number Diff line
@@ -1619,17 +1619,13 @@ static int o2hb_map_slot_data(struct o2hb_region *reg) 
	struct o2hb_disk_slot *slot;



	reg->hr_tmp_block = kmalloc(reg->hr_block_bytes, GFP_KERNEL);

	if (reg->hr_tmp_block == NULL) {

		mlog_errno(-ENOMEM);

	if (reg->hr_tmp_block == NULL)

		return -ENOMEM;

	}



	reg->hr_slots = kcalloc(reg->hr_blocks,

				sizeof(struct o2hb_disk_slot), GFP_KERNEL);

	if (reg->hr_slots == NULL) {

		mlog_errno(-ENOMEM);

	if (reg->hr_slots == NULL)

		return -ENOMEM;

	}



	for(i = 0; i < reg->hr_blocks; i++) {

		slot = &reg->hr_slots[i];
@@ -1645,17 +1641,13 @@ static int o2hb_map_slot_data(struct o2hb_region *reg) 


	reg->hr_slot_data = kcalloc(reg->hr_num_pages, sizeof(struct page *),

				    GFP_KERNEL);

	if (!reg->hr_slot_data) {

		mlog_errno(-ENOMEM);

	if (!reg->hr_slot_data)

		return -ENOMEM;

	}



	for(i = 0; i < reg->hr_num_pages; i++) {

		page = alloc_page(GFP_KERNEL);

		if (!page) {

			mlog_errno(-ENOMEM);

		if (!page)

			return -ENOMEM;

		}



		reg->hr_slot_data[i] = page;
@@ -1687,10 +1679,8 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) 
	struct o2hb_disk_heartbeat_block *hb_block;



	ret = o2hb_read_slots(reg, reg->hr_blocks);

	if (ret) {

		mlog_errno(ret);

	if (ret)

		goto out;

	}



	/* We only want to get an idea of the values initially in each

	 * slot, so we do no verification - o2hb_check_slot will