diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2011-06-26 10:16:36 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-06-28 19:31:19 -0400 |
commit | 0df7e8b8f1c25c10820bdc679555f2fbfb897ca0 (patch) | |
tree | 626a0304fceec0bbee93e43a24bc0f813fe230b7 /security/tomoyo/securityfs_if.c | |
parent | b5bc60b4ce313b6dbb42e7d32915dcf0a07c2a68 (diff) |
TOMOYO: Cleanup part 3.
Use common structure for ACL with "struct list_head" + "atomic_t".
Use array/struct where possible.
Remove is_group from "struct tomoyo_name_union"/"struct tomoyo_number_union".
Pass "struct file"->private_data rather than "struct file".
Update some of comments.
Bring tomoyo_same_acl_head() from common.h to domain.c .
Bring tomoyo_invalid()/tomoyo_valid() from common.h to util.c .
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/securityfs_if.c')
-rw-r--r-- | security/tomoyo/securityfs_if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c index a5bd76d7f6be..6410868c8a3d 100644 --- a/security/tomoyo/securityfs_if.c +++ b/security/tomoyo/securityfs_if.c | |||
@@ -34,7 +34,7 @@ static int tomoyo_open(struct inode *inode, struct file *file) | |||
34 | */ | 34 | */ |
35 | static int tomoyo_release(struct inode *inode, struct file *file) | 35 | static int tomoyo_release(struct inode *inode, struct file *file) |
36 | { | 36 | { |
37 | return tomoyo_close_control(file); | 37 | return tomoyo_close_control(file->private_data); |
38 | } | 38 | } |
39 | 39 | ||
40 | /** | 40 | /** |
@@ -63,7 +63,7 @@ static unsigned int tomoyo_poll(struct file *file, poll_table *wait) | |||
63 | static ssize_t tomoyo_read(struct file *file, char __user *buf, size_t count, | 63 | static ssize_t tomoyo_read(struct file *file, char __user *buf, size_t count, |
64 | loff_t *ppos) | 64 | loff_t *ppos) |
65 | { | 65 | { |
66 | return tomoyo_read_control(file, buf, count); | 66 | return tomoyo_read_control(file->private_data, buf, count); |
67 | } | 67 | } |
68 | 68 | ||
69 | /** | 69 | /** |
@@ -79,7 +79,7 @@ static ssize_t tomoyo_read(struct file *file, char __user *buf, size_t count, | |||
79 | static ssize_t tomoyo_write(struct file *file, const char __user *buf, | 79 | static ssize_t tomoyo_write(struct file *file, const char __user *buf, |
80 | size_t count, loff_t *ppos) | 80 | size_t count, loff_t *ppos) |
81 | { | 81 | { |
82 | return tomoyo_write_control(file, buf, count); | 82 | return tomoyo_write_control(file->private_data, buf, count); |
83 | } | 83 | } |
84 | 84 | ||
85 | /* | 85 | /* |