diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-11 00:48:00 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-11 00:48:00 -0400 |
commit | ce23e640133484eebc20ca7b7668388213e11327 (patch) | |
tree | 0b37de221fe6790396c3ae636bc56e5aacbcaf46 /fs/jfs | |
parent | b296821a7c42fa58baa17513b2b7b30ae66f3336 (diff) |
->getxattr(): pass dentry and inode as separate arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/jfs_xattr.h | 2 | ||||
-rw-r--r-- | fs/jfs/xattr.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/jfs/jfs_xattr.h b/fs/jfs/jfs_xattr.h index e8d717dabca3..e69e14f3777b 100644 --- a/fs/jfs/jfs_xattr.h +++ b/fs/jfs/jfs_xattr.h | |||
@@ -57,7 +57,7 @@ extern int __jfs_setxattr(tid_t, struct inode *, const char *, const void *, | |||
57 | extern int jfs_setxattr(struct dentry *, const char *, const void *, size_t, | 57 | extern int jfs_setxattr(struct dentry *, const char *, const void *, size_t, |
58 | int); | 58 | int); |
59 | extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t); | 59 | extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t); |
60 | extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t); | 60 | extern ssize_t jfs_getxattr(struct dentry *, struct inode *, const char *, void *, size_t); |
61 | extern ssize_t jfs_listxattr(struct dentry *, char *, size_t); | 61 | extern ssize_t jfs_listxattr(struct dentry *, char *, size_t); |
62 | extern int jfs_removexattr(struct dentry *, const char *); | 62 | extern int jfs_removexattr(struct dentry *, const char *); |
63 | 63 | ||
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index 48b15a6e5558..5becc6a3ff8c 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c | |||
@@ -933,8 +933,8 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data, | |||
933 | return size; | 933 | return size; |
934 | } | 934 | } |
935 | 935 | ||
936 | ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data, | 936 | ssize_t jfs_getxattr(struct dentry *dentry, struct inode *inode, |
937 | size_t buf_size) | 937 | const char *name, void *data, size_t buf_size) |
938 | { | 938 | { |
939 | int err; | 939 | int err; |
940 | 940 | ||
@@ -944,7 +944,7 @@ ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data, | |||
944 | * for it via sb->s_xattr. | 944 | * for it via sb->s_xattr. |
945 | */ | 945 | */ |
946 | if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) | 946 | if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) |
947 | return generic_getxattr(dentry, name, data, buf_size); | 947 | return generic_getxattr(dentry, inode, name, data, buf_size); |
948 | 948 | ||
949 | if (strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) == 0) { | 949 | if (strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) == 0) { |
950 | /* | 950 | /* |
@@ -959,7 +959,7 @@ ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data, | |||
959 | return -EOPNOTSUPP; | 959 | return -EOPNOTSUPP; |
960 | } | 960 | } |
961 | 961 | ||
962 | err = __jfs_getxattr(d_inode(dentry), name, data, buf_size); | 962 | err = __jfs_getxattr(inode, name, data, buf_size); |
963 | 963 | ||
964 | return err; | 964 | return err; |
965 | } | 965 | } |