Attachment 130000 Details for Bug 174072 – file.diff

[patch] file.diff

file.diff (text/plain), 1.38 KB, created by Enji Cooper on 2012-12-03 04:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2012-12-03 04:30:00 UTC

Size: 1.38 KB

patch

obsolete

>Index: usr.sbin/mptutil/mpt_config.c
>===================================================================
>--- usr.sbin/mptutil/mpt_config.c	(revision 243802)
>+++ usr.sbin/mptutil/mpt_config.c	(working copy)
>@@ -305,10 +305,10 @@
> 	}
> 
> 	printf("mpt%d: Configuration cleared\n", mpt_unit);
>-	mpt_rescan_bus(-1, -1);
>+	error = mpt_rescan_bus(-1, -1);
> 	close(fd);
> 
>-	return (0);
>+	return (error);
> }
> MPT_COMMAND(top, clear, clear_config);
> 
>@@ -742,7 +742,7 @@
> #ifdef DEBUG
> skip:
> #endif
>-	mpt_rescan_bus(vol->VolumeBus, vol->VolumeID);
>+	error = mpt_rescan_bus(vol->VolumeBus, vol->VolumeID);
> 
> 	/* Clean up. */
> 	free(vol);
>@@ -752,7 +752,7 @@
> 	free(state.ioc2);
> 	close(fd);
> 
>-	return (0);
>+	return (error);
> }
> MPT_COMMAND(top, create, create_volume);
> 
>@@ -792,10 +792,10 @@
> 		return (error);
> 	}
> 
>-	mpt_rescan_bus(-1, -1);
>+	error = mpt_rescan_bus(-1, -1);
> 	close(fd);
> 
>-	return (0);
>+	return (error);
> }
> MPT_COMMAND(top, delete, delete_volume);
> 
>@@ -1015,7 +1015,9 @@
> 		return (error);
> 	}
> 
>-	mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
>+	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
>+	if (error)
>+		return (error);
> 	free(info);
> 	close(fd);
> 
>@@ -1119,7 +1121,9 @@
> 		return (error);
> 	}
> 
>-	mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
>+	error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID);
>+	if (error)
>+		return (error);
> 	free(info);
> 	close(fd);

Actions: View | Diff

Attachments on bug 174072: 130000