From 39643598a216c2e892cd94ccb441180a4c4f949e Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 2 Aug 2010 00:44:37 -0500 Subject: [PATCH] SOLARIS: let xlator load if amd64/nfssrv is loaded 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 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/SOLARIS/osi_machdep.h | 1 + src/afs/SOLARIS/osi_vfsops.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index 9027a0e7c..ca25455c2 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -31,6 +31,7 @@ */ #define NFSSRV "/kernel/misc/nfssrv" #define NFSSRV_V9 "/kernel/misc/sparcv9/nfssrv" +#define NFSSRV_AMD64 "/kernel/misc/amd64/nfssrv" typedef struct cred afs_ucred_t; typedef struct proc afs_proc_t; diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index b17d495fe..9a3e08bc6 100644 --- a/src/afs/SOLARIS/osi_vfsops.c +++ b/src/afs/SOLARIS/osi_vfsops.c @@ -581,7 +581,8 @@ _init() #if defined(AFS_SUN55_ENV) if ((!(mp = mod_find_by_filename("misc", "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-> mod_installed)) { -- 2.39.5