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/hugetlbfs/inode.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/hugetlbfs/inode.c')
-rw-r--r-- | fs/hugetlbfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 08ad76c79b49..870a721b8bd2 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -958,7 +958,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size) | |||
958 | if (!can_do_hugetlb_shm()) | 958 | if (!can_do_hugetlb_shm()) |
959 | return ERR_PTR(-EPERM); | 959 | return ERR_PTR(-EPERM); |
960 | 960 | ||
961 | if (!user_shm_lock(size, current->user)) | 961 | if (!user_shm_lock(size, current->cred->user)) |
962 | return ERR_PTR(-ENOMEM); | 962 | return ERR_PTR(-ENOMEM); |
963 | 963 | ||
964 | root = hugetlbfs_vfsmount->mnt_root; | 964 | root = hugetlbfs_vfsmount->mnt_root; |
@@ -998,7 +998,7 @@ out_inode: | |||
998 | out_dentry: | 998 | out_dentry: |
999 | dput(dentry); | 999 | dput(dentry); |
1000 | out_shm_unlock: | 1000 | out_shm_unlock: |
1001 | user_shm_unlock(size, current->user); | 1001 | user_shm_unlock(size, current->cred->user); |
1002 | return ERR_PTR(error); | 1002 | return ERR_PTR(error); |
1003 | } | 1003 | } |
1004 | 1004 | ||