DEVEL15-rcu-patch-fallout-20090629

LICENSE IPL10
FIXES 124996

massaging this for 1.5.x/head caused some fallout. fix doubled endif, and
install_session_keyring arguments

(cherry picked from commit 3d5415922ea4ede4ce538d7894a6062bf115c6bd)

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 0df0661..959a92b 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -342,7 +342,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
 
 #ifdef LINUX_KEYRING_SUPPORT
     if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
-       (void) install_session_keyring(current, NULL);
+       (void) install_session_keyring(NULL);
 
        if (current_session_keyring()) {
            struct key *key;

diff --git a/src/afs/afs_osi_gcpags.c b/src/afs/afs_osi_gcpags.c
index 41aaa93..5c7ebf6 100644 (file)
--- a/src/afs/afs_osi_gcpags.c
+++ b/src/afs/afs_osi_gcpags.c
@@ -547,6 +547,5 @@ afs_osi_proc2cred(AFS_PROC * pr)
     return rv;
 }
 #endif
-#endif
 
 #endif /* AFS_GCPAGS */