diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 17:28:04 +0200 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 17:28:04 +0200 |
commit | 13e98fd1efc7f65cab1bba6cfab7859840f9aa66 (patch) | |
tree | 88be4e84a1c257e7e999d7bd344c511c66e7973e /fs/hfsplus/xattr.h | |
parent | e28e909c36bb5d6319953822d84df00fce7cbd18 (diff) | |
parent | 05fb05a6ca25e02ad8c31bc440b3c4996864f379 (diff) | |
download | linux-13e98fd1efc7f65cab1bba6cfab7859840f9aa66.tar.bz2 |
Merge tag 'kvm-arm-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.7-rc2
Fixes for the vgic, 2 of the patches address a bug introduced in v4.6
while the rest are for the new vgic.
Diffstat (limited to 'fs/hfsplus/xattr.h')
-rw-r--r-- | fs/hfsplus/xattr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h index d04ba6f58df2..68f6b539371f 100644 --- a/fs/hfsplus/xattr.h +++ b/fs/hfsplus/xattr.h @@ -21,7 +21,7 @@ extern const struct xattr_handler *hfsplus_xattr_handlers[]; int __hfsplus_setxattr(struct inode *inode, const char *name, const void *value, size_t size, int flags); -int hfsplus_setxattr(struct dentry *dentry, const char *name, +int hfsplus_setxattr(struct inode *inode, const char *name, const void *value, size_t size, int flags, const char *prefix, size_t prefixlen); |