jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SOLARIS: let xlator load if amd64/nfssrv is loaded

Browse Source 
The NFS translator-enabled kernel module refuses to load if
misc/nfssrv is not also loaded. We were only checking misc/nfssrv and
misc/sparcv9/nfssrv, though, not misc/amd64/nfssrv. Check that, too,
as it may be loaded on amd64 machines.

Reported by Robert Milkowski.

Change-Id: Idbb9c4136b87ffa4c72ca376738001fb6a3ca7d8
Reviewed-on: http://gerrit.openafs.org/2497
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2010-08-02 00:44:37 -05:00 committed by Derrick Brashear
parent c53513e834
commit 39643598a2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/afs/SOLARIS/osi_machdep.h
View File

@ -31,6 +31,7 @@
*/ */
#define NFSSRV "/kernel/misc/nfssrv" #define NFSSRV "/kernel/misc/nfssrv"
#define NFSSRV_V9 "/kernel/misc/sparcv9/nfssrv" #define NFSSRV_V9 "/kernel/misc/sparcv9/nfssrv"
#define NFSSRV_AMD64 "/kernel/misc/amd64/nfssrv"
typedef struct cred afs_ucred_t; typedef struct cred afs_ucred_t;
typedef struct proc afs_proc_t; typedef struct proc afs_proc_t;

3
src/afs/SOLARIS/osi_vfsops.c
View File

@ -581,7 +581,8 @@ _init()
#if defined(AFS_SUN55_ENV) #if defined(AFS_SUN55_ENV)
if ((!(mp = mod_find_by_filename("misc", "nfssrv")) if ((!(mp = mod_find_by_filename("misc", "nfssrv"))
&& !(mp = mod_find_by_filename(NULL, NFSSRV)) && !(mp = mod_find_by_filename(NULL, NFSSRV))
&& !(mp = mod_find_by_filename(NULL, NFSSRV_V9))) || (mp && !(mp = mod_find_by_filename(NULL, NFSSRV_V9))
&& !(mp = mod_find_by_filename(NULL, NFSSRV_AMD64))) || (mp
&& !mp-> && !mp->
mod_installed)) mod_installed))
{ {