diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:49 -0500 |
commit | 3d5ff529ea222461a5fa3c4df05cbdc5eb56864d (patch) | |
tree | 28ec8432eb9212bc04e345c2e85addc132f3a34e /security/selinux/selinuxfs.c | |
parent | 7ac6207b2a6a5b828bc333f2530a3bd48197af3e (diff) |
[PATCH] struct path: convert selinux
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux/selinuxfs.c')
-rw-r--r-- | security/selinux/selinuxfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index cd244419c980..c8bf6e172f6e 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -448,7 +448,7 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = { | |||
448 | 448 | ||
449 | static ssize_t selinux_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos) | 449 | static ssize_t selinux_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos) |
450 | { | 450 | { |
451 | ino_t ino = file->f_dentry->d_inode->i_ino; | 451 | ino_t ino = file->f_path.dentry->d_inode->i_ino; |
452 | char *data; | 452 | char *data; |
453 | ssize_t rv; | 453 | ssize_t rv; |
454 | 454 | ||
@@ -805,7 +805,7 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf, | |||
805 | goto out; | 805 | goto out; |
806 | } | 806 | } |
807 | 807 | ||
808 | inode = filep->f_dentry->d_inode; | 808 | inode = filep->f_path.dentry->d_inode; |
809 | cur_enforcing = security_get_bool_value(inode->i_ino - BOOL_INO_OFFSET); | 809 | cur_enforcing = security_get_bool_value(inode->i_ino - BOOL_INO_OFFSET); |
810 | if (cur_enforcing < 0) { | 810 | if (cur_enforcing < 0) { |
811 | ret = cur_enforcing; | 811 | ret = cur_enforcing; |
@@ -864,7 +864,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf, | |||
864 | if (new_value) | 864 | if (new_value) |
865 | new_value = 1; | 865 | new_value = 1; |
866 | 866 | ||
867 | inode = filep->f_dentry->d_inode; | 867 | inode = filep->f_path.dentry->d_inode; |
868 | bool_pending_values[inode->i_ino - BOOL_INO_OFFSET] = new_value; | 868 | bool_pending_values[inode->i_ino - BOOL_INO_OFFSET] = new_value; |
869 | length = count; | 869 | length = count; |
870 | 870 | ||
@@ -965,7 +965,7 @@ static void sel_remove_bools(struct dentry *de) | |||
965 | file_list_lock(); | 965 | file_list_lock(); |
966 | list_for_each(p, &sb->s_files) { | 966 | list_for_each(p, &sb->s_files) { |
967 | struct file * filp = list_entry(p, struct file, f_u.fu_list); | 967 | struct file * filp = list_entry(p, struct file, f_u.fu_list); |
968 | struct dentry * dentry = filp->f_dentry; | 968 | struct dentry * dentry = filp->f_path.dentry; |
969 | 969 | ||
970 | if (dentry->d_parent != de) { | 970 | if (dentry->d_parent != de) { |
971 | continue; | 971 | continue; |