Attachment #130000 for bug #174072

View | Details | Raw Unified | Return to bug 174072
Collapse All | Expand All




	}

	printf("mpt%d: Configuration cleared\n", mpt_unit);
	error = mpt_rescan_bus(-1, -1);
	close(fd);

	return (error);
}
MPT_COMMAND(top, clear, clear_config);


#ifdef DEBUG
skip:
#endif
	error = mpt_rescan_bus(vol->VolumeBus, vol->VolumeID);

	/* Clean up. */
	free(vol);

	free(state.ioc2);
	close(fd);

	return (error);
}
MPT_COMMAND(top, create, create_volume);


		return (error);
	}

	error = mpt_rescan_bus(-1, -1);
	close(fd);

	return (error);
}
MPT_COMMAND(top, delete, delete_volume);


		return (error);
	}

	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
	if (error)
		return (error);
	free(info);
	close(fd);


		return (error);
	}

	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
	if (error)
		return (error);
	free(info);
	close(fd);

Return to bug 174072

Lines 305-314 Link Here

(-)usr.sbin/mptutil/mpt_config.c (-8 / +12 lines)
305	}	305	}
306		306
307	printf("mpt%d: Configuration cleared\n", mpt_unit);	307	printf("mpt%d: Configuration cleared\n", mpt_unit);
308	mpt_rescan_bus(-1, -1);	308	error = mpt_rescan_bus(-1, -1);
309	close(fd);	309	close(fd);
310		310
311	return (0);	311	return (error);
312	}	312	}
313	MPT_COMMAND(top, clear, clear_config);	313	MPT_COMMAND(top, clear, clear_config);
314		314
Lines 742-748 Link Here
742	#ifdef DEBUG	742	#ifdef DEBUG
743	skip:	743	skip:
744	#endif	744	#endif
745	mpt_rescan_bus(vol->VolumeBus, vol->VolumeID);	745	error = mpt_rescan_bus(vol->VolumeBus, vol->VolumeID);
746		746
747	/* Clean up. */	747	/* Clean up. */
748	free(vol);	748	free(vol);
Lines 752-758 Link Here
752	free(state.ioc2);	752	free(state.ioc2);
753	close(fd);	753	close(fd);
754		754
755	return (0);	755	return (error);
756	}	756	}
757	MPT_COMMAND(top, create, create_volume);	757	MPT_COMMAND(top, create, create_volume);
758		758
Lines 792-801 Link Here
792	return (error);	792	return (error);
793	}	793	}
794		794
795	mpt_rescan_bus(-1, -1);	795	error = mpt_rescan_bus(-1, -1);
796	close(fd);	796	close(fd);
797		797
798	return (0);	798	return (error);
799	}	799	}
800	MPT_COMMAND(top, delete, delete_volume);	800	MPT_COMMAND(top, delete, delete_volume);
801		801
Lines 1015-1021 Link Here
1015	return (error);	1015	return (error);
1016	}	1016	}
1017		1017
1018	mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);	1018	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
		1019	if (error)
		1020	return (error);
1019	free(info);	1021	free(info);
1020	close(fd);	1022	close(fd);
1021		1023
Lines 1119-1125 Link Here
1119	return (error);	1121	return (error);
1120	}	1122	}
1121		1123
1122	mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);	1124	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
		1125	if (error)
		1126	return (error);
1123	free(info);	1127	free(info);
1124	close(fd);	1128	close(fd);