STABLE14-linux-rcu-read-lock-export-20090623

LICENSE IPL10
FIXES 124986

deal with rcu_read_lock() becoming GPLONLY

(cherry picked from commit 0e718b642cedd1ebc799ada35960164c95c24280)

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 3c7e2b3d29be0ec3e0ba68bdc4d49c6d210c10ed..e302148d81f43282560ede4db6897a6105d1f4fb 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -228,7 +228,7 @@ extern struct key_type key_type_keyring __attribute__((weak));
 static struct key_type *__key_type_keyring = &key_type_keyring;
 
 static int
-install_session_keyring(struct task_struct *task, struct key *keyring)
+install_session_keyring(struct key *keyring)
 {
     struct key *old;
     char desc[20];
@@ -242,21 +242,21 @@ install_session_keyring(struct task_struct *task, struct key *keyring)
 
        /* create an empty session keyring */
        not_in_quota = KEY_ALLOC_IN_QUOTA;
-       sprintf(desc, "_ses.%u", task->tgid);
+       sprintf(desc, "_ses.%u", current->tgid);
 
 #if defined(KEY_ALLOC_NEEDS_STRUCT_TASK)
        keyring = key_alloc(__key_type_keyring, desc,
-                           task_uid(task), task_gid(task), task,
+                           current_uid(), current_gid(), current,
                            (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
                            not_in_quota);
 #elif defined(KEY_ALLOC_NEEDS_CRED)
        keyring = key_alloc(__key_type_keyring, desc,
-                           task_uid(task), task_gid(task), current_cred(),
+                           current_uid(), current_gid(), current_cred(),
                            (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
                            not_in_quota);
 #else
        keyring = key_alloc(__key_type_keyring, desc,
-                           task_uid(task), task_gid(task),
+                           current_uid(), current_gid(),
                            (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
                            not_in_quota);
 #endif
@@ -273,11 +273,11 @@ install_session_keyring(struct task_struct *task, struct key *keyring)
     }
 
     /* install the keyring */
-    spin_lock_irq(&task->sighand->siglock);
-    old = task_session_keyring(task);
+    spin_lock_irq(&current->sighand->siglock);
+    old = task_session_keyring(current);
     smp_wmb();
-    task_session_keyring(task) = keyring;
-    spin_unlock_irq(&task->sighand->siglock);
+    task_session_keyring(current) = keyring;
+    spin_unlock_irq(&current->sighand->siglock);
 
     if (old)
            key_put(old);
@@ -340,7 +340,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
 #ifdef LINUX_KEYRING_SUPPORT
     if (code == 0) {
 
-       (void) install_session_keyring(current, NULL);
+       (void) install_session_keyring(NULL);
 
        if (current_session_keyring()) {
            struct key *key;
@@ -658,7 +658,10 @@ void osi_keyring_init(void)
 #if defined(EXPORTED_FIND_TASK_BY_PID)
        p = find_task_by_pid(1);
 #else
+       p = pid_task(1, PIDTYPE_PID);
+/*
        p = find_task_by_vpid(1);
+*/
 #endif
        if (p && task_user(p)->session_keyring)
            __key_type_keyring = task_user(p)->session_keyring->type;

diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index 0b586fe5c9e9d264a6f7666db0890c4e88bdd727..5a51bf7d233aa204caf11540b6c8ec6597c3a3ab 100644 (file)
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -843,7 +843,7 @@ extern rwlock_t tasklist_lock __attribute__((weak));
 void
 afs_osi_TraverseProcTable()
 {
-#if !defined(LINUX_KEYRING_SUPPORT)
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK))
     struct task_struct *p;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK)
@@ -1110,6 +1110,7 @@ afs_osi_proc2cred(AFS_PROC * pr)
     return rv;
 }
 #elif defined(AFS_LINUX22_ENV)
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK))
 const struct AFS_UCRED *
 afs_osi_proc2cred(AFS_PROC * pr)
 {
@@ -1142,6 +1143,7 @@ afs_osi_proc2cred(AFS_PROC * pr)
 
     return rv;
 }
+#endif
 #else
 const struct AFS_UCRED *
 afs_osi_proc2cred(AFS_PROC * pr)

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index fb0f292b651bf33372e0ee145a129e36d7418bb6..1884f4cd68792e73797e41dfee3f59fadf05fdba 100644 (file)
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -552,7 +552,7 @@ afs_SetPrimary(register struct unixuser *au, register int aflag)
 }                              /*afs_SetPrimary */
 
 
-#if AFS_GCPAGS
+#if defined(AFS_GCPAGS)
 
 /*
  * Called by osi_TraverseProcTable (from afs_GCPAGs) for each 
@@ -581,6 +581,7 @@ static size_t afs_GCPAGs_cred_count = 0;
 /*
  * LOCKS: afs_GCPAGs_perproc_func requires write lock on afs_xuser
  */
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK))
 void
 afs_GCPAGs_perproc_func(AFS_PROC * pproc)
 {
@@ -629,6 +630,7 @@ afs_GCPAGs_perproc_func(AFS_PROC * pproc)
        }
     }
 }
+#endif
 
 /*
  * Go through the process table, find all unused PAGs