From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 21 Aug 2005 00:09:34 +0000 (+0000)
Subject: - remove last vestiges of CKRM
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~102
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4952570bd4ba2f8a5f746429e68108de377cd4b7;p=linux-2.6.git

- remove last vestiges of CKRM
- sync fedora branch
---

diff --git a/kernel/sys.c b/kernel/sys.c
index d2116a98d..31835a6e0 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -365,8 +365,7 @@ asmlinkage long sys_getpriority(int which, int who)
 out_unlock:
 	read_unlock(&tasklist_lock);
 
-	key_fsgid_changed(current);
-	return 0;
+	return retval;
 }
 
 long vs_reboot(unsigned int, void *);
@@ -509,7 +508,6 @@ void ctrl_alt_del(void)
 }
 	
 
-
 /*
  * Unprivileged users may change the real gid to the effective gid
  * or vice versa.  (BSD-style)
@@ -569,7 +567,6 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
 	current->fsgid = new_egid;
 	current->egid = new_egid;
 	current->gid = new_rgid;
-
 	key_fsgid_changed(current);
 	return 0;
 }
@@ -610,7 +607,6 @@ asmlinkage long sys_setgid(gid_t gid)
 		return -EPERM;
 
 	key_fsgid_changed(current);
-
 	return 0;
 }