Linux: Don't waste autoconf checks on cpp defines

[openafs.git] / src / afs / LINUX / osi_gcpags.c

diff --git a/src/afs/LINUX/osi_gcpags.c b/src/afs/LINUX/osi_gcpags.c
index f5e7618..ec32c6c 100644 (file)
--- a/src/afs/LINUX/osi_gcpags.c
+++ b/src/afs/LINUX/osi_gcpags.c
@@ -22,14 +22,13 @@
  */
 
 
-#if defined(AFS_LINUX22_ENV)
 #ifdef EXPORTED_TASKLIST_LOCK
 extern rwlock_t tasklist_lock __attribute__((weak));
 #endif
 void
 afs_osi_TraverseProcTable(void)
 {
-#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK))
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(HAVE_LINUX_RCU_READ_LOCK))
     struct task_struct *p;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK)
@@ -43,7 +42,7 @@ afs_osi_TraverseProcTable(void)
        rcu_read_lock();
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
 
-#ifdef DEFINED_FOR_EACH_PROCESS
+#if defined(for_each_process)
     for_each_process(p) if (p->pid) {
 #ifdef STRUCT_TASK_STRUCT_HAS_EXIT_STATE
        if (p->exit_state)
@@ -122,21 +121,4 @@ afs_osi_proc2cred(afs_proc_t * pr)
 }
 #endif
 
-#else
-
-const afs_ucred_t *
-afs_osi_proc2cred(afs_proc_t * pr)
-{
-    afs_ucred_t *rv = NULL;
-
-    if (pr == NULL) {
-       return NULL;
-    }
-    rv = pr->p_cred;
-
-    return rv;
-}
-
-#endif /* AFS_LINUX22_ENV */
-
 #endif /* AFS_GCPAGS */