DEVEL15-ifdef-nfs-translator-20070102

FIXES 50602

appropriately wrap nfs translator code in ifdefs

(cherry picked from commit 84cfee7d07510d007df63788ffce028255829d41)

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 6ba552c6fe0858a1699f049be13ceee50e37f881..7d9d661bd4d4c26c5fffa6828e198b0fc6c44238 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,7 +124,9 @@ 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();
 

diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c
index 9fec38a0f2701729cbf1fc35976fdd86f6c9e062..429d4d90fe4e2064e27d762ee5a473b5b1c1714a 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 0a44eb8f3a799f516c513c16c929f039725f46f3..f98c66181853c3d8051cd6fbbd5e5750eeec4e30 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 7a33329df70fa4840e71aa09575e9b0703664279..97c3e41c01d97b98940f065cca14b019bdaf9584 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -423,8 +423,10 @@ 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);