diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /fs/squashfs | |
parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
parent | ce23e640133484eebc20ca7b7668388213e11327 (diff) |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'fs/squashfs')
-rw-r--r-- | fs/squashfs/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c index 1e9de96288d8..1548b3784548 100644 --- a/fs/squashfs/xattr.c +++ b/fs/squashfs/xattr.c | |||
@@ -214,10 +214,12 @@ failed: | |||
214 | 214 | ||
215 | 215 | ||
216 | static int squashfs_xattr_handler_get(const struct xattr_handler *handler, | 216 | static int squashfs_xattr_handler_get(const struct xattr_handler *handler, |
217 | struct dentry *d, const char *name, | 217 | struct dentry *unused, |
218 | struct inode *inode, | ||
219 | const char *name, | ||
218 | void *buffer, size_t size) | 220 | void *buffer, size_t size) |
219 | { | 221 | { |
220 | return squashfs_xattr_get(d_inode(d), handler->flags, name, | 222 | return squashfs_xattr_get(inode, handler->flags, name, |
221 | buffer, size); | 223 | buffer, size); |
222 | } | 224 | } |
223 | 225 | ||