copy-pastes, minor diskfilter cleanup

dev-tools/omdb/src/bin/omdb/db.rs

@@ -1438,8 +1438,8 @@ async fn cmd_db_physical_disks(
     let sleds = datastore
         .physical_disk_list(&opctx, &first_page(limit), filter)
         .await
-        .context("listing sleds")?;
-    check_limit(&sleds, limit, || String::from("listing sleds"));
+        .context("listing physical disks")?;
+    check_limit(&sleds, limit, || String::from("listing physical disks"));
 
     let rows = sleds.into_iter().map(|s| PhysicalDiskRow::from(s));
     let table = tabled::Table::new(rows)

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -1614,7 +1614,7 @@ async fn cmd_nexus_sled_expunge_disk(
         }
     };
 
-    // Now check whether its sled-agent or SP were found in the most recent
+    // Now check whether its sled-agent was found in the most recent
     // inventory collection.
     match datastore
         .inventory_get_latest_collection(opctx)

nexus/types/src/deployment/planning_input.rs

@@ -355,15 +355,7 @@ impl DiskFilter {
         policy: PhysicalDiskPolicy,
         state: PhysicalDiskState,
     ) -> bool {
-        match self {
-            DiskFilter::All => true,
-            DiskFilter::InService => match (policy, state) {
-                (PhysicalDiskPolicy::InService, PhysicalDiskState::Active) => {
-                    true
-                }
-                _ => false,
-            },
-        }
+        policy.matches(self) && state.matches(self)
     }
 }