diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 20:48:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 20:48:24 -0400 |
commit | b296821a7c42fa58baa17513b2b7b30ae66f3336 (patch) | |
tree | 5cb6593218b793ff77df1c21ea74b756af9c8540 /fs/f2fs/xattr.c | |
parent | 79a628d14ec7ee9adfdc3ce04343d5ff7ec20c18 (diff) |
xattr_handler: pass dentry and inode as separate arguments of ->get()
... and do not assume they are already attached to each other
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/f2fs/xattr.c')
-rw-r--r-- | fs/f2fs/xattr.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 06a72dc0191a..17fd2b1a6848 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c | |||
@@ -26,10 +26,10 @@ | |||
26 | #include "xattr.h" | 26 | #include "xattr.h" |
27 | 27 | ||
28 | static int f2fs_xattr_generic_get(const struct xattr_handler *handler, | 28 | static int f2fs_xattr_generic_get(const struct xattr_handler *handler, |
29 | struct dentry *dentry, const char *name, void *buffer, | 29 | struct dentry *unused, struct inode *inode, |
30 | size_t size) | 30 | const char *name, void *buffer, size_t size) |
31 | { | 31 | { |
32 | struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb); | 32 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); |
33 | 33 | ||
34 | switch (handler->flags) { | 34 | switch (handler->flags) { |
35 | case F2FS_XATTR_INDEX_USER: | 35 | case F2FS_XATTR_INDEX_USER: |
@@ -45,7 +45,7 @@ static int f2fs_xattr_generic_get(const struct xattr_handler *handler, | |||
45 | default: | 45 | default: |
46 | return -EINVAL; | 46 | return -EINVAL; |
47 | } | 47 | } |
48 | return f2fs_getxattr(d_inode(dentry), handler->flags, name, | 48 | return f2fs_getxattr(inode, handler->flags, name, |
49 | buffer, size, NULL); | 49 | buffer, size, NULL); |
50 | } | 50 | } |
51 | 51 | ||
@@ -86,11 +86,9 @@ static bool f2fs_xattr_trusted_list(struct dentry *dentry) | |||
86 | } | 86 | } |
87 | 87 | ||
88 | static int f2fs_xattr_advise_get(const struct xattr_handler *handler, | 88 | static int f2fs_xattr_advise_get(const struct xattr_handler *handler, |
89 | struct dentry *dentry, const char *name, void *buffer, | 89 | struct dentry *unused, struct inode *inode, |
90 | size_t size) | 90 | const char *name, void *buffer, size_t size) |
91 | { | 91 | { |
92 | struct inode *inode = d_inode(dentry); | ||
93 | |||
94 | if (buffer) | 92 | if (buffer) |
95 | *((char *)buffer) = F2FS_I(inode)->i_advise; | 93 | *((char *)buffer) = F2FS_I(inode)->i_advise; |
96 | return sizeof(char); | 94 | return sizeof(char); |