Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / fs / f2fs / xattr.h

diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
index b21d9ebdeff39efdf64485116bf53ce17263bb7e..34ab7dbcf5e3f0867b9afefb0d1e3a4952a247bb 100644 (file)
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
@@ -114,18 +114,18 @@ extern const struct xattr_handler f2fs_xattr_security_handler;
 extern const struct xattr_handler *f2fs_xattr_handlers[];
 
 extern int f2fs_setxattr(struct inode *, int, const char *,
-                               const void *, size_t, struct page *);
+                               const void *, size_t, struct page *, int);
 extern int f2fs_getxattr(struct inode *, int, const char *, void *, size_t);
 extern ssize_t f2fs_listxattr(struct dentry *, char *, size_t);
 #else
 
 #define f2fs_xattr_handlers    NULL
-static inline int f2fs_setxattr(struct inode *inode, int name_index,
-               const char *name, const void *value, size_t value_len)
+static inline int f2fs_setxattr(struct inode *inode, int index,
+               const char *name, const void *value, size_t size, int flags)
 {
        return -EOPNOTSUPP;
 }
-static inline int f2fs_getxattr(struct inode *inode, int name_index,
+static inline int f2fs_getxattr(struct inode *inode, int index,
                const char *name, void *buffer, size_t buffer_size)
 {
        return -EOPNOTSUPP;