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/jffs2 | |
| 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/jffs2')
| -rw-r--r-- | fs/jffs2/security.c | 6 | ||||
| -rw-r--r-- | fs/jffs2/xattr_trusted.c | 6 | ||||
| -rw-r--r-- | fs/jffs2/xattr_user.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c index 7a28facd7175..3ed9a4b49778 100644 --- a/fs/jffs2/security.c +++ b/fs/jffs2/security.c | |||
| @@ -49,10 +49,10 @@ int jffs2_init_security(struct inode *inode, struct inode *dir, | |||
| 49 | 49 | ||
| 50 | /* ---- XATTR Handler for "security.*" ----------------- */ | 50 | /* ---- XATTR Handler for "security.*" ----------------- */ |
| 51 | static int jffs2_security_getxattr(const struct xattr_handler *handler, | 51 | static int jffs2_security_getxattr(const struct xattr_handler *handler, |
| 52 | struct dentry *dentry, const char *name, | 52 | struct dentry *unused, struct inode *inode, |
| 53 | void *buffer, size_t size) | 53 | const char *name, void *buffer, size_t size) |
| 54 | { | 54 | { |
| 55 | return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_SECURITY, | 55 | return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY, |
| 56 | name, buffer, size); | 56 | name, buffer, size); |
| 57 | } | 57 | } |
| 58 | 58 | ||
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c index b2555ef07a12..4ebecff1d922 100644 --- a/fs/jffs2/xattr_trusted.c +++ b/fs/jffs2/xattr_trusted.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | #include "nodelist.h" | 17 | #include "nodelist.h" |
| 18 | 18 | ||
| 19 | static int jffs2_trusted_getxattr(const struct xattr_handler *handler, | 19 | static int jffs2_trusted_getxattr(const struct xattr_handler *handler, |
| 20 | struct dentry *dentry, const char *name, | 20 | struct dentry *unused, struct inode *inode, |
| 21 | void *buffer, size_t size) | 21 | const char *name, void *buffer, size_t size) |
| 22 | { | 22 | { |
| 23 | return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_TRUSTED, | 23 | return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED, |
| 24 | name, buffer, size); | 24 | name, buffer, size); |
| 25 | } | 25 | } |
| 26 | 26 | ||
diff --git a/fs/jffs2/xattr_user.c b/fs/jffs2/xattr_user.c index 539bd630b5e4..bce249e1b277 100644 --- a/fs/jffs2/xattr_user.c +++ b/fs/jffs2/xattr_user.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | #include "nodelist.h" | 17 | #include "nodelist.h" |
| 18 | 18 | ||
| 19 | static int jffs2_user_getxattr(const struct xattr_handler *handler, | 19 | static int jffs2_user_getxattr(const struct xattr_handler *handler, |
| 20 | struct dentry *dentry, const char *name, | 20 | struct dentry *unused, struct inode *inode, |
| 21 | void *buffer, size_t size) | 21 | const char *name, void *buffer, size_t size) |
| 22 | { | 22 | { |
| 23 | return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_USER, | 23 | return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER, |
| 24 | name, buffer, size); | 24 | name, buffer, size); |
| 25 | } | 25 | } |
| 26 | 26 | ||
