From 5bd1a6140aa79cd3ac7e8e384a4f84d4fe3f008c Mon Sep 17 00:00:00 2001 From: Douglas Engert Date: Wed, 14 May 2003 15:37:06 +0000 Subject: [PATCH] solaris8-dont-read-binding-file-20030513 FIXES 1434 Sun changed read_binding_file in a patch; Make sure we avoid the problem. We don't need to call it if afs was already in /etc/system. --- src/afs/SOLARIS/osi_vfsops.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index 4db6cf462..5cf3c157b 100644 --- a/src/afs/SOLARIS/osi_vfsops.c +++ b/src/afs/SOLARIS/osi_vfsops.c @@ -436,7 +436,7 @@ _init() printf("misc/nfssrv module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } -#else +#else /* !AFS_SUN55_ENV */ #if defined(AFS_SUN52_ENV) if ((!(mp = mod_find_by_filename("fs", "nfs")) && !(mp = mod_find_by_filename(NULL, "/kernel/fs/nfs")) && @@ -445,9 +445,10 @@ _init() printf("fs/nfs module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } -#endif -#endif -#endif +#endif /* AFS_SUN52_ENV */ +#endif /* AFS_SUN55_ENV */ +#endif /* !AFS_NONFSTRANS */ +#if !defined(AFS_SUN58_ENV) /* * Re-read the /etc/name_to_sysnum file to make sure afs isn't added after * reboot. Ideally we would like to call modctl_read_sysbinding_file() but @@ -460,14 +461,12 @@ _init() #ifdef AFS_SUN53_ENV #ifndef SYSBINDFILE #define SYSBINDFILE "/etc/name_to_sysnum" -#endif +#endif /* SYSBINDFILE */ read_binding_file(SYSBINDFILE, sb_hashtab); -#else +#else /* !AFS_SUN53_ENV */ read_binding_file(sysbind, sb_hashtab); -#endif -#if !defined(AFS_SUN58_ENV) +#endif /* AFS_SUN53_ENV */ make_syscallname("afs", AFS_SYSCALL); -#endif if (sysent[AFS_SYSCALL].sy_call == nosys) { if ((sysn = mod_getsysname(AFS_SYSCALL)) != NULL) { @@ -476,11 +475,12 @@ _init() rw_init(sysent[AFS_SYSCALL].sy_lock, "afs_syscall", #ifdef AFS_SUN57_ENV RW_DEFAULT, NULL); -#else +#else /* !AFS_SUN57_ENV */ RW_DEFAULT, DEFAULT_WT); -#endif +#endif /* AFS_SUN57_ENV */ } } +#endif /* !AFS_SUN58_ENV */ osi_Init(); /* initialize global lock, etc */ -- 2.39.5