From 915e341bac689d8431f98bf1e7fb58edd975755d Mon Sep 17 00:00:00 2001
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 11 Sep 2012 04:54:44 +0000
Subject: [PATCH] Slightly reduce an overhead for the open() call in the
 zfsloader. libstand(3) tries to detect file system in the predefined order,
 but zfsloader usually is used for the booting from ZFS, and there is no need
 to try detect several file system types for each open() call.

---
 sys/boot/i386/loader/conf.c    | 6 +++---
 sys/boot/sparc64/loader/main.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index dda2eac829a5..d925a350f09d 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -70,6 +70,9 @@ struct devsw *devsw[] = {
 };
 
 struct fs_ops *file_system[] = {
+#if defined(LOADER_ZFS_SUPPORT)
+    &zfs_fsops,
+#endif
     &ufs_fsops,
     &ext2fs_fsops,
     &dosfs_fsops,
@@ -78,9 +81,6 @@ struct fs_ops *file_system[] = {
     &nandfs_fsops,
 #endif
     &splitfs_fsops,
-#if defined(LOADER_ZFS_SUPPORT)
-    &zfs_fsops,
-#endif
 #ifdef LOADER_GZIP_SUPPORT
     &gzipfs_fsops,
 #endif
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 9b76f0d46bf6..fa9d0681a54c 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -170,15 +170,15 @@ struct file_format *file_formats[] = {
 };
 
 struct fs_ops *file_system[] = {
+#ifdef LOADER_ZFS_SUPPORT
+	&zfs_fsops,
+#endif
 #ifdef LOADER_UFS_SUPPORT
 	&ufs_fsops,
 #endif
 #ifdef LOADER_CD9660_SUPPORT
 	&cd9660_fsops,
 #endif
-#ifdef LOADER_ZFS_SUPPORT
-	&zfs_fsops,
-#endif
 #ifdef LOADER_ZIP_SUPPORT
 	&zipfs_fsops,
 #endif