ifdef-nfs-translator-20070102

FIXES 50602

appropriately wrap nfs translator code in ifdefs

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 6ba552c..7d9d661 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -83,8 +83,10 @@ init_module(void)
 
     osi_Init();
 #ifdef AFS_LINUX26_ENV
+#if !defined(AFS_NONFSTRANS)
     osi_linux_nfssrv_init();
 #endif
+#endif
 
 #ifndef LINUX_KEYRING_SUPPORT
     err = osi_syscall_init();
@@ -122,8 +124,10 @@ cleanup_module(void)
 
     afs_destroy_inodecache();
 #ifdef AFS_LINUX26_ENV
+#if !defined(AFS_NONFSTRANS)
     osi_linux_nfssrv_shutdown();
 #endif
+#endif
     osi_linux_free_afs_memory();
 
 #ifdef AFS_LINUX24_ENV

diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c
index 9fec38a..429d4d9 100644 (file)
--- a/src/afs/LINUX/osi_nfssrv.c
+++ b/src/afs/LINUX/osi_nfssrv.c
@@ -17,6 +17,7 @@
 RCSID
     ("$Header$");
 
+#if !defined(AFS_NONFSTRANS) || defined(AFS_AIX_IAUTH_ENV)
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
@@ -253,3 +254,5 @@ void osi_linux_nfssrv_shutdown(void)
     ReleaseWriteLock(&afs_xnfssrv);
     AFS_GUNLOCK();
 }
+#endif /* AFS_NONFSTRANS */
+

diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c
index 0a44eb8..f98c661 100644 (file)
--- a/src/afs/LINUX/osi_pag_module.c
+++ b/src/afs/LINUX/osi_pag_module.c
@@ -17,6 +17,7 @@
 RCSID
     ("$Header$");
 
+#if !defined(AFS_NONFSTRANS) || defined(AFS_AIX_IAUTH_ENV)
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
@@ -140,3 +141,5 @@ afs_nfsclient_reqhandler(struct afs_exporter *exporter,
     return EINVAL;
 }
 #endif
+#endif /* AFS_NONFSTRANS */
+

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 7a33329..97c3e41 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -423,9 +423,11 @@ afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred)
        return EIO;
 
 #ifdef AFS_LINUX26_ENV
+#if !defined(AFS_NONFSTRANS)
     if (osi_linux_nfs_initreq(av, acred, &code))
        return code;
 #endif
+#endif
 
     av->uid = PagInCred(acred);
     if (av->uid == NOPAG) {