diff options
Diffstat (limited to 'fs/ext2/xattr_security.c')
-rw-r--r-- | fs/ext2/xattr_security.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c index 70c0dbdcdcb7..b118c6383c6d 100644 --- a/fs/ext2/xattr_security.c +++ b/fs/ext2/xattr_security.c | |||
@@ -4,6 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
7 | #include <linux/slab.h> | ||
7 | #include <linux/string.h> | 8 | #include <linux/string.h> |
8 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
9 | #include <linux/ext2_fs.h> | 10 | #include <linux/ext2_fs.h> |
@@ -11,8 +12,8 @@ | |||
11 | #include "xattr.h" | 12 | #include "xattr.h" |
12 | 13 | ||
13 | static size_t | 14 | static size_t |
14 | ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size, | 15 | ext2_xattr_security_list(struct dentry *dentry, char *list, size_t list_size, |
15 | const char *name, size_t name_len) | 16 | const char *name, size_t name_len, int type) |
16 | { | 17 | { |
17 | const int prefix_len = XATTR_SECURITY_PREFIX_LEN; | 18 | const int prefix_len = XATTR_SECURITY_PREFIX_LEN; |
18 | const size_t total_len = prefix_len + name_len + 1; | 19 | const size_t total_len = prefix_len + name_len + 1; |
@@ -26,22 +27,22 @@ ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size, | |||
26 | } | 27 | } |
27 | 28 | ||
28 | static int | 29 | static int |
29 | ext2_xattr_security_get(struct inode *inode, const char *name, | 30 | ext2_xattr_security_get(struct dentry *dentry, const char *name, |
30 | void *buffer, size_t size) | 31 | void *buffer, size_t size, int type) |
31 | { | 32 | { |
32 | if (strcmp(name, "") == 0) | 33 | if (strcmp(name, "") == 0) |
33 | return -EINVAL; | 34 | return -EINVAL; |
34 | return ext2_xattr_get(inode, EXT2_XATTR_INDEX_SECURITY, name, | 35 | return ext2_xattr_get(dentry->d_inode, EXT2_XATTR_INDEX_SECURITY, name, |
35 | buffer, size); | 36 | buffer, size); |
36 | } | 37 | } |
37 | 38 | ||
38 | static int | 39 | static int |
39 | ext2_xattr_security_set(struct inode *inode, const char *name, | 40 | ext2_xattr_security_set(struct dentry *dentry, const char *name, |
40 | const void *value, size_t size, int flags) | 41 | const void *value, size_t size, int flags, int type) |
41 | { | 42 | { |
42 | if (strcmp(name, "") == 0) | 43 | if (strcmp(name, "") == 0) |
43 | return -EINVAL; | 44 | return -EINVAL; |
44 | return ext2_xattr_set(inode, EXT2_XATTR_INDEX_SECURITY, name, | 45 | return ext2_xattr_set(dentry->d_inode, EXT2_XATTR_INDEX_SECURITY, name, |
45 | value, size, flags); | 46 | value, size, flags); |
46 | } | 47 | } |
47 | 48 | ||