Linux 2.6.35 compat, const struct xattr_handler

The const keyword was added to the 'struct xattr_handler' in the
generic Linux super_block structure.  To handle this we define an
appropriate xattr_handler_t typedef which can be used.  This was
the preferred solution because it keeps the code clean and readable.

diff --git a/Makefile.in b/Makefile.in
index 0d10478..f772c3b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,6 +72,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 016045a..9c56ab4 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index 08f8377..8d215ea 100644 (file)
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index 44fff71..4db2632 100644 (file)
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index 1141281..6952f9c 100644 (file)
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index 69747f3..e280583 100644 (file)
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index f800e6b..c19f9bc 100644 (file)
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zpool_id/Makefile.in b/cmd/zpool_id/Makefile.in
index 5d32e81..828621d 100644 (file)
--- a/cmd/zpool_id/Makefile.in
+++ b/cmd/zpool_id/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/zpool_layout/Makefile.in b/cmd/zpool_layout/Makefile.in
index ef53493..bc9f465 100644 (file)
--- a/cmd/zpool_layout/Makefile.in
+++ b/cmd/zpool_layout/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index ec16a73..ead6808 100644 (file)
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/config/kernel-xattr-handler.m4 b/config/kernel-xattr-handler.m4
new file mode 100644 (file)
index 0000000..fa72945
--- /dev/null
+++ b/config/kernel-xattr-handler.m4
@@ -0,0 +1,32 @@
+dnl #
+dnl # 2.6.35 API change,
+dnl # The 'struct xattr_handler' was constified in the generic
+dnl # super_block structure.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_CONST_XATTR_HANDLER],
+       [AC_MSG_CHECKING([whether super_block uses const struct xattr_hander])
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+               #include <linux/xattr.h>
+
+               const struct xattr_handler xattr_test_handler = {
+                       .prefix = "test",
+                       .get    = NULL,
+                       .set    = NULL,
+               };
+
+               const struct xattr_handler *xattr_handlers[] = {
+                       &xattr_test_handler,
+               };
+       ],[
+               struct super_block sb;
+
+               sb.s_xattr = xattr_handlers;
+       ],[
+               AC_MSG_RESULT([yes])
+               AC_DEFINE(HAVE_CONST_XATTR_HANDLER, 1,
+                         [super_block uses const struct xattr_hander])
+       ],[
+               AC_MSG_RESULT([no])
+       ])
+])

diff --git a/config/kernel.m4 b/config/kernel.m4
index 2c83dc5..d1ed54f 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -28,6 +28,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_GET_DISK_RO
        ZFS_AC_KERNEL_RQ_IS_SYNC
        ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT
+       ZFS_AC_KERNEL_CONST_XATTR_HANDLER
 
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"

diff --git a/configure b/configure
index 716a73f..19123d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -13822,6 +13822,83 @@ fi
 
 
 
+       { $as_echo "$as_me:$LINENO: checking whether super_block uses const struct xattr_hander" >&5
+$as_echo_n "checking whether super_block uses const struct xattr_hander... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/fs.h>
+               #include <linux/xattr.h>
+
+               const struct xattr_handler xattr_test_handler = {
+                       .prefix = "test",
+                       .get    = NULL,
+                       .set    = NULL,
+               };
+
+               const struct xattr_handler *xattr_handlers[] = {
+                       &xattr_test_handler,
+               };
+
+int
+main (void)
+{
+
+               struct super_block sb;
+
+               sb.s_xattr = xattr_handlers;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CONST_XATTR_HANDLER 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+
 
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -17349,6 +17426,83 @@ fi
 
 
 
+       { $as_echo "$as_me:$LINENO: checking whether super_block uses const struct xattr_hander" >&5
+$as_echo_n "checking whether super_block uses const struct xattr_hander... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/fs.h>
+               #include <linux/xattr.h>
+
+               const struct xattr_handler xattr_test_handler = {
+                       .prefix = "test",
+                       .get    = NULL,
+                       .set    = NULL,
+               };
+
+               const struct xattr_handler *xattr_handlers[] = {
+                       &xattr_test_handler,
+               };
+
+int
+main (void)
+{
+
+               struct super_block sb;
+
+               sb.s_xattr = xattr_handlers;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CONST_XATTR_HANDLER 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+
 
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 4d39394..b9f7f36 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/Makefile.in b/include/Makefile.in
index f87cd79..8be6edc 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index 4ccd7b1..67b56f8 100644 (file)
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -2,6 +2,7 @@ COMMON_H =
 
 KERNEL_H = \
        $(top_srcdir)/include/linux/dcache_compat.h
+       $(top_srcdir)/include/linux/xattr_compat.h
 
 USER_H =
 

diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in
index 51d0a6d..bd6db6f 100644 (file)
--- a/include/linux/Makefile.in
+++ b/include/linux/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \
@@ -562,6 +563,7 @@ uninstall-am: uninstall-kernelHEADERS uninstall-libzfsHEADERS
        ps ps-am tags uninstall uninstall-am uninstall-kernelHEADERS \
        uninstall-libzfsHEADERS
 
+       $(top_srcdir)/include/linux/xattr_compat.h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/include/linux/xattr_compat.h b/include/linux/xattr_compat.h
new file mode 100644 (file)
index 0000000..dfa92ac
--- /dev/null
+++ b/include/linux/xattr_compat.h
@@ -0,0 +1,42 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (C) 2011 Lawrence Livermore National Security, LLC.
+ */
+
+#ifndef _ZFS_XATTR_H
+#define _ZFS_XATTR_H
+
+/*
+ * 2.6.35 API change,
+ * The const keyword was added to the 'struct xattr_handler' in the
+ * generic Linux super_block structure.  To handle this we define an
+ * appropriate xattr_handler_t typedef which can be used.  This was
+ * the preferred solution because it keeps the code clean and readable.
+ */
+#ifdef HAVE_CONST_XATTR_HANDLER
+typedef const struct xattr_handler     xattr_handler_t;
+#else
+typedef struct xattr_handler           xattr_handler_t;
+#endif
+
+#endif /* _ZFS_XATTR_H */

diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in
index 1525d1d..e95245f 100644 (file)
--- a/include/sys/Makefile.in
+++ b/include/sys/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in
index 4099398..fe92c17 100644 (file)
--- a/include/sys/fm/Makefile.in
+++ b/include/sys/fm/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in
index ddad523..2e78a76 100644 (file)
--- a/include/sys/fm/fs/Makefile.in
+++ b/include/sys/fm/fs/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in
index 903b08d..968a9f2 100644 (file)
--- a/include/sys/fs/Makefile.in
+++ b/include/sys/fs/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index 33f4f62..b8c3d09 100644 (file)
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -26,6 +26,7 @@
 #define        _SYS_ZPL_H
 
 #include <sys/vfs.h>
+#include <linux/xattr_compat.h>
 
 /* zpl_inode.c */
 extern const struct inode_operations zpl_inode_operations;
@@ -58,6 +59,6 @@ extern struct file_system_type zpl_fs_type;
 extern ssize_t zpl_xattr_list(struct dentry *dentry, char *buf, size_t size);
 extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip);
 
-extern struct xattr_handler *zpl_xattr_handlers[];
+extern xattr_handler_t *zpl_xattr_handlers[];
 
 #endif /* _SYS_ZPL_H */

diff --git a/lib/Makefile.in b/lib/Makefile.in
index d607102..de0b8b7 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index 9159093..3c249ea 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index 7839c13..f162acf 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 0bafbab..f0da5c4 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 8aa947a..b21c56d 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in
index 0a8ff7c..7d30489 100644 (file)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in
index 6ef7483..9050242 100644 (file)
--- a/lib/libspl/asm-i386/Makefile.in
+++ b/lib/libspl/asm-i386/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in
index 5c1aeaf..028d192 100644 (file)
--- a/lib/libspl/asm-x86_64/Makefile.in
+++ b/lib/libspl/asm-x86_64/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in
index 0f2a688..d72b0aa 100644 (file)
--- a/lib/libspl/include/Makefile.in
+++ b/lib/libspl/include/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/ia32/Makefile.in b/lib/libspl/include/ia32/Makefile.in
index d3a8f6f..295310b 100644 (file)
--- a/lib/libspl/include/ia32/Makefile.in
+++ b/lib/libspl/include/ia32/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/ia32/sys/Makefile.in b/lib/libspl/include/ia32/sys/Makefile.in
index 5f7e05f..a6f6072 100644 (file)
--- a/lib/libspl/include/ia32/sys/Makefile.in
+++ b/lib/libspl/include/ia32/sys/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/rpc/Makefile.in b/lib/libspl/include/rpc/Makefile.in
index 850f045..96fdca6 100644 (file)
--- a/lib/libspl/include/rpc/Makefile.in
+++ b/lib/libspl/include/rpc/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/sys/Makefile.in b/lib/libspl/include/sys/Makefile.in
index f8f8294..8bde0cb 100644 (file)
--- a/lib/libspl/include/sys/Makefile.in
+++ b/lib/libspl/include/sys/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/sys/dktp/Makefile.in b/lib/libspl/include/sys/dktp/Makefile.in
index 19b0f3b..ec4a3a9 100644 (file)
--- a/lib/libspl/include/sys/dktp/Makefile.in
+++ b/lib/libspl/include/sys/dktp/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/sys/sysevent/Makefile.in b/lib/libspl/include/sys/sysevent/Makefile.in
index 96af2d3..8d71235 100644 (file)
--- a/lib/libspl/include/sys/sysevent/Makefile.in
+++ b/lib/libspl/include/sys/sysevent/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libspl/include/util/Makefile.in b/lib/libspl/include/util/Makefile.in
index bfaec7a..daa1c57 100644 (file)
--- a/lib/libspl/include/util/Makefile.in
+++ b/lib/libspl/include/util/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index fb075e8..9cb8129 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 32d6a74..1cd7310 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index 1dbecc3..000f3aa 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 344612d..14a2b17 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/man/Makefile.in b/man/Makefile.in
index 3dbed30..f0b9b70 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in
index f3cd856..58e804b 100644 (file)
--- a/man/man8/Makefile.in
+++ b/man/man8/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 910500a..86e52f7 100644 (file)
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -305,7 +305,7 @@ zpl_xattr_user_set(struct inode *ip, const char *name,
        return (error);
 }
 
-struct xattr_handler zpl_xattr_user_handler = {
+xattr_handler_t zpl_xattr_user_handler = {
        .prefix = XATTR_USER_PREFIX,
        .get    = zpl_xattr_user_get,
        .set    = zpl_xattr_user_set,
@@ -351,7 +351,7 @@ zpl_xattr_trusted_set(struct inode *ip, const char *name,
        return (error);
 }
 
-struct xattr_handler zpl_xattr_trusted_handler = {
+xattr_handler_t zpl_xattr_trusted_handler = {
        .prefix = XATTR_TRUSTED_PREFIX,
        .get    = zpl_xattr_trusted_get,
        .set    = zpl_xattr_trusted_set,
@@ -415,13 +415,13 @@ zpl_xattr_security_init(struct inode *ip, struct inode *dip)
         return (error);
 }
 
-struct xattr_handler zpl_xattr_security_handler = {
+xattr_handler_t zpl_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
        .get    = zpl_xattr_security_get,
        .set    = zpl_xattr_security_set,
 };
 
-struct xattr_handler *zpl_xattr_handlers[] = {
+xattr_handler_t *zpl_xattr_handlers[] = {
        &zpl_xattr_security_handler,
        &zpl_xattr_trusted_handler,
        &zpl_xattr_user_handler,

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 6653bf3..2b2e30d 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in
index fd95774..f369bbc 100644 (file)
--- a/scripts/zpios-profile/Makefile.in
+++ b/scripts/zpios-profile/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in
index fcb6dfe..9dfbe10 100644 (file)
--- a/scripts/zpios-test/Makefile.in
+++ b/scripts/zpios-test/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in
index da8b65e..cc3e557 100644 (file)
--- a/scripts/zpool-config/Makefile.in
+++ b/scripts/zpool-config/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/scripts/zpool-layout/Makefile.in b/scripts/zpool-layout/Makefile.in
index dde427b..881676c 100644 (file)
--- a/scripts/zpool-layout/Makefile.in
+++ b/scripts/zpool-layout/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
        $(top_srcdir)/config/user-frame-larger-than.m4 \

diff --git a/zfs_config.h.in b/zfs_config.h.in
index f8e2182..52061a0 100644 (file)
--- a/zfs_config.h.in
+++ b/zfs_config.h.in
@@ -54,6 +54,9 @@
 /* blk_rq_sectors() is available */
 #undef HAVE_BLK_RQ_SECTORS
 
+/* super_block uses const struct xattr_hander */
+#undef HAVE_CONST_XATTR_HANDLER
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H