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)
This commit is contained in:
Marc Dionne 2009-06-29 14:59:31 +00:00 committed by Derrick Brashear
parent 3c36d66237
commit 6e25934482
2 changed files with 1 additions and 2 deletions

View File

@ -342,7 +342,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
#ifdef LINUX_KEYRING_SUPPORT #ifdef LINUX_KEYRING_SUPPORT
if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) { if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
(void) install_session_keyring(current, NULL); (void) install_session_keyring(NULL);
if (current_session_keyring()) { if (current_session_keyring()) {
struct key *key; struct key *key;

View File

@ -547,6 +547,5 @@ afs_osi_proc2cred(AFS_PROC * pr)
return rv; return rv;
} }
#endif #endif
#endif
#endif /* AFS_GCPAGS */ #endif /* AFS_GCPAGS */