- remove last vestiges of CKRM

- sync fedora branch

diff --git a/kernel/sys.c b/kernel/sys.c
index d2116a9..31835a6 100644 (file)
--- 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;
 }