summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-04-10 20:48:24 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-04-10 20:48:24 -0400
commitb296821a7c42fa58baa17513b2b7b30ae66f3336 (patch)
tree5cb6593218b793ff77df1c21ea74b756af9c8540 /fs/btrfs/xattr.c
parent79a628d14ec7ee9adfdc3ce04343d5ff7ec20c18 (diff)
downloadlinux-stable-b296821a7c42fa58baa17513b2b7b30ae66f3336.tar.gz
linux-stable-b296821a7c42fa58baa17513b2b7b30ae66f3336.tar.bz2
linux-stable-b296821a7c42fa58baa17513b2b7b30ae66f3336.zip
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/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 145d2b89e62d..03224b00ea70 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -369,11 +369,9 @@ err:
}
static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
- struct dentry *dentry, const char *name,
- void *buffer, size_t size)
+ struct dentry *unused, struct inode *inode,
+ const char *name, void *buffer, size_t size)
{
- struct inode *inode = d_inode(dentry);
-
name = xattr_full_name(handler, name);
return __btrfs_getxattr(inode, name, buffer, size);
}