Author: tsoome
Date: Wed Dec 4 16:41:00 2019
New Revision: 355392
URL: https://svnweb.freebsd.org/changeset/base/355392
Log:
loader: clean up efipart filter expressions
Small cleanup based on illumos review.
Modified:
head/stand/efi/libefi/efipart.c
Modified: head/stand/efi/libefi/efipart.c
==============================================================================
--- head/stand/efi/libefi/efipart.c Wed Dec 4 15:14:14 2019
(r355391)
+++ head/stand/efi/libefi/efipart.c Wed Dec 4 16:41:00 2019
(r355392)
@@ -324,22 +324,21 @@ efipart_ignore_device(EFI_HANDLE h, EFI_BLOCK_IO *blki
parent_is_usb = true;
free(parent);
- /* no media, parent is USB and devicepath is lun. */
node = efi_devpath_last_node(devpath);
if (node == NULL)
return (false);
if (parent_is_usb &&
- DevicePathType(node) == MESSAGING_DEVICE_PATH &&
- DevicePathSubType(node) == MSG_DEVICE_LOGICAL_UNIT_DP) {
- efi_close_devpath(h);
- return (true);
- }
- /* no media, parent is USB and devicepath is SCSI. */
- if (parent_is_usb &&
- DevicePathType(node) == MESSAGING_DEVICE_PATH &&
- DevicePathSubType(node) == MSG_SCSI_DP) {
- efi_close_devpath(h);
- return (true);
+ DevicePathType(node) == MESSAGING_DEVICE_PATH) {
+ /*
+ * no media, parent is USB and devicepath is
+ * LUN or SCSI.
+ */
+ if (DevicePathSubType(node) ==
+ MSG_DEVICE_LOGICAL_UNIT_DP ||
+ DevicePathSubType(node) == MSG_SCSI_DP) {
+ efi_close_devpath(h);
+ return (true);
+ }
}
}
return (false);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
