X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FLINUX%2Fosi_gcpags.c;h=34ceb06959439317e41e649dfe3683a49c3eb125;hp=86c719915985755d0cb5c5e3010d2e6260091d8c;hb=91a576142e36fa423ee1a571a040b5ccf16d10d7;hpb=009b547195eed40f7fa2fede24068c90e30c33e5

diff --git a/src/afs/LINUX/osi_gcpags.c b/src/afs/LINUX/osi_gcpags.c
index 86c7199..34ceb06 100644
--- a/src/afs/LINUX/osi_gcpags.c
+++ b/src/afs/LINUX/osi_gcpags.c
@@ -31,16 +31,7 @@ afs_osi_TraverseProcTable(void)
 #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_STRUCT_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)
-    if (&tasklist_lock)
-	read_lock(&tasklist_lock);
-#endif /* EXPORTED_TASKLIST_LOCK */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK)
-    else
-#endif /* EXPORTED_TASKLIST_LOCK && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */
-	rcu_read_lock();
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
+    rcu_read_lock();
 
 #if defined(for_each_process)
     for_each_process(p) if (p->pid) {
@@ -65,16 +56,8 @@ afs_osi_TraverseProcTable(void)
 	afs_GCPAGs_perproc_func(p);
     }
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK)
-    if (&tasklist_lock)
-	read_unlock(&tasklist_lock);
-#endif /* EXPORTED_TASKLIST_LOCK */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK)
-    else
-#endif /* EXPORTED_TASKLIST_LOCK && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */
-	rcu_read_unlock();
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
+
+    rcu_read_unlock();
 #endif
 }
 
@@ -83,7 +66,7 @@ afs_osi_TraverseProcTable(void)
  * subsequent calls may overwrite the previously returned value.
  */
 
-#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_STRUCT_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK))
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_STRUCT_HAS_CRED) || defined(HAVE_LINUX_RCU_READ_LOCK))
 const afs_ucred_t *
 afs_osi_proc2cred(afs_proc_t * pr)
 {
@@ -102,17 +85,12 @@ afs_osi_proc2cred(afs_proc_t * pr)
 	 * allocated. */
 	atomic_set(&cr.cr_ref, 1);
 	afs_set_cr_uid(&cr, task_uid(pr));
-#if defined(AFS_LINUX26_ENV)
 #if defined(STRUCT_TASK_STRUCT_HAS_CRED)
 	get_group_info(pr->cred->group_info);
-	set_cr_group_info(&cr, pr->cred->group_info);
+	afs_set_cr_group_info(&cr, pr->cred->group_info);
 #else
 	get_group_info(pr->group_info);
-	set_cr_group_info(&cr, pr->group_info);
-#endif
-#else
-	cr.cr_ngroups = pr->ngroups;
-	memcpy(cr.cr_groups, pr->groups, NGROUPS * sizeof(gid_t));
+	afs_set_cr_group_info(&cr, pr->group_info);
 #endif
 	rv = &cr;
     }