diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:16 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:16 -0500 |
commit | b6dff3ec5e116e3af6f537d4caedcad6b9e5082a (patch) | |
tree | 9e76f972eb7ce9b84e0146c8e4126a3f86acb428 /fs/nfsd/nfs4recover.c | |
parent | 15a2460ed0af7538ca8e6c610fe607a2cd9da142 (diff) |
CRED: Separate task security context from task_struct
Separate the task security context from task_struct. At this point, the
security data is temporarily embedded in the task_struct with two pointers
pointing to it.
Note that the Alpha arch is altered as it refers to (E)UID and (E)GID in
entry.S via asm-offsets.
With comment fixes Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r-- | fs/nfsd/nfs4recover.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index bb93946ace22..a5e14e8695ea 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -57,17 +57,17 @@ static int rec_dir_init = 0; | |||
57 | static void | 57 | static void |
58 | nfs4_save_user(uid_t *saveuid, gid_t *savegid) | 58 | nfs4_save_user(uid_t *saveuid, gid_t *savegid) |
59 | { | 59 | { |
60 | *saveuid = current->fsuid; | 60 | *saveuid = current->cred->fsuid; |
61 | *savegid = current->fsgid; | 61 | *savegid = current->cred->fsgid; |
62 | current->fsuid = 0; | 62 | current->cred->fsuid = 0; |
63 | current->fsgid = 0; | 63 | current->cred->fsgid = 0; |
64 | } | 64 | } |
65 | 65 | ||
66 | static void | 66 | static void |
67 | nfs4_reset_user(uid_t saveuid, gid_t savegid) | 67 | nfs4_reset_user(uid_t saveuid, gid_t savegid) |
68 | { | 68 | { |
69 | current->fsuid = saveuid; | 69 | current->cred->fsuid = saveuid; |
70 | current->fsgid = savegid; | 70 | current->cred->fsgid = savegid; |
71 | } | 71 | } |
72 | 72 | ||
73 | static void | 73 | static void |