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

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 0df066106f7ef09bba26b3cb1c98aea19a4f0837..959a92b7001f3e8c1775d5d426032b4111fa7508 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 41aaa9345124c63361e676eceeea4b93a107e57c..5c7ebf6675985d14c027a59ab25d5e7b2fcb3dcf 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 */