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.
This commit is contained in:
Brian Behlendorf
parent
1b94c25ceb
commit
777d4af891
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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])
|
||||
])
|
||||
])
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -13816,6 +13816,83 @@ $as_echo "no" >&6; }
|
|||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -Rf build
|
||||
|
||||
|
||||
|
||||
{ $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
|
||||
|
|
@ -17343,6 +17420,83 @@ $as_echo "no" >&6; }
|
|||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -Rf build
|
||||
|
||||
|
||||
|
||||
{ $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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ COMMON_H =
|
|||
|
||||
KERNEL_H = \
|
||||
$(top_srcdir)/include/linux/dcache_compat.h
|
||||
$(top_srcdir)/include/linux/xattr_compat.h
|
||||
|
||||
USER_H =
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue