Fix patch mis-merge

jasonbking · jasonbking · commit 3a3da934fabe · 2023-10-11T17:10:32.000Z
diff --git a/module/zfs/vdev_trim.c b/module/zfs/vdev_trim.c
@@ -637,7 +637,7 @@ vdev_trim_ranges(trim_args_t *ta)
 	}
 	mutex_exit(&vd->vdev_trim_io_lock);
 
-	return (0);
+	return (error);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ vdev_trim_ranges(trim_args_t *ta)`
`637`	`637`	`}`
`638`	`638`	`mutex_exit(&vd->vdev_trim_io_lock);`
`639`	`639`
`640`		`- return (0);`
	`640`	`+ return (error);`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`static void`