Fix the comment in zfs.h

[zfs.git] / include / linux / xattr_compat.h

diff --git a/include/linux/xattr_compat.h b/include/linux/xattr_compat.h
index dfa92ac..84d8fde 100644 (file)
--- a/include/linux/xattr_compat.h
+++ b/include/linux/xattr_compat.h
@@ -39,4 +39,57 @@ typedef const struct xattr_handler   xattr_handler_t;
 typedef struct xattr_handler           xattr_handler_t;
 #endif
 
+/*
+ * 2.6.33 API change,
+ * The xattr_hander->get() callback was changed to take a dentry
+ * instead of an inode, and a handler_flags argument was added.
+ */
+#ifdef HAVE_DENTRY_XATTR_GET
+#define ZPL_XATTR_GET_WRAPPER(fn)                                      \
+static int                                                             \
+fn(struct dentry *dentry, const char *name, void *buffer, size_t size, \
+    int unused_handler_flags)                                          \
+{                                                                      \
+       return __ ## fn(dentry->d_inode, name, buffer, size);           \
+}
+#else
+#define ZPL_XATTR_GET_WRAPPER(fn)                                      \
+static int                                                             \
+fn(struct inode *ip, const char *name, void *buffer, size_t size)      \
+{                                                                      \
+       return __ ## fn(ip, name, buffer, size);                        \
+}
+#endif /* HAVE_DENTRY_XATTR_GET */
+
+/*
+ * 2.6.33 API change,
+ * The xattr_hander->set() callback was changed to take a dentry
+ * instead of an inode, and a handler_flags argument was added.
+ */
+#ifdef HAVE_DENTRY_XATTR_SET
+#define ZPL_XATTR_SET_WRAPPER(fn)                                      \
+static int                                                             \
+fn(struct dentry *dentry, const char *name, const void *buffer,                \
+    size_t size, int flags, int unused_handler_flags)                  \
+{                                                                      \
+       return __ ## fn(dentry->d_inode, name, buffer, size, flags);    \
+}
+#else
+#define ZPL_XATTR_SET_WRAPPER(fn)                                      \
+static int                                                             \
+fn(struct inode *ip, const char *name, const void *buffer,             \
+    size_t size, int flags)                                            \
+{                                                                      \
+       return __ ## fn(ip, name, buffer, size, flags);                 \
+}
+#endif /* HAVE_DENTRY_XATTR_SET */
+
+#ifdef HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY
+#define zpl_security_inode_init_security(ip, dip, qstr, nm, val, len)  \
+       security_inode_init_security(ip, dip, qstr, nm, val, len)
+#else
+#define zpl_security_inode_init_security(ip, dip, qstr, nm, val, len)  \
+       security_inode_init_security(ip, dip, nm, val, len)
+#endif /* HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY */
+
 #endif /* _ZFS_XATTR_H */