xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / nfs / nfs_boot.c

diff --git a/bsd/nfs/nfs_boot.c b/bsd/nfs/nfs_boot.c
index 98dbc23675ebfb427b2bda6353664edc0f0b5902..85de9123c20181492f8820e3e063460033ecdfad 100644 (file)
--- a/bsd/nfs/nfs_boot.c
+++ b/bsd/nfs/nfs_boot.c
@@ -205,7 +205,7 @@ nfs_boot_init(nd, procp)
        if (netboot_iaddr(&my_ip) == FALSE) {
            printf("nfs_boot: networking is not initialized\n");
            error = ENXIO;
-           goto failed;
+           goto failed_noswitch;
        }
 
        /* get the root path information */
@@ -286,9 +286,10 @@ nfs_boot_init(nd, procp)
        else {
                error = 0;
        }
-#endif NO_MOUNT_PRIVATE
- failed:
+#endif /* NO_MOUNT_PRIVATE */
+failed:
        thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
+failed_noswitch:
        return (error);
 }
 
@@ -325,7 +326,7 @@ nfs_boot_getfh(nd, procp, v3)
                        goto failed;
                }
        }
-#endif NO_MOUNT_PRIVATE
+#endif /* NO_MOUNT_PRIVATE */
  failed:
        thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);
        return (error);