CRED: Wrap current->cred and a few other accessors

[net-next-2.6.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 63964d863ad6d1cfebc3407d640fad640afef509..c594cc0e40fbcb2af3a6cb928e0bca2392d04156 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -205,13 +205,14 @@ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
 int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
                int force)
 {
+       const struct cred *cred = current_cred();
        int err;
        
        err = security_file_set_fowner(filp);
        if (err)
                return err;
 
-       f_modown(filp, pid, type, current_uid(), current_euid(), force);
+       f_modown(filp, pid, type, cred->uid, cred->euid, force);
        return 0;
 }
 EXPORT_SYMBOL(__f_setown);