Linux 3.3 compat, sops->show_options()
The second argument of sops->show_options() was changed from a 'struct vfsmount *' to a 'struct dentry *'. Add an autoconf check to detect the API change and then conditionally define the expected interface. In either case we are only interested in the zfs_sb_t. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #549
This commit is contained in:
Brian Behlendorf
parent
d7e398ce1a
commit
47621f3d76
|
|
@ -92,6 +92,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
dnl #
|
||||
dnl # Linux 3.3 API
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [
|
||||
AC_MSG_CHECKING([whether sops->show_options() wants dentry])
|
||||
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
int (*show_options) (struct seq_file *, struct dentry *) = NULL;
|
||||
struct super_operations sops __attribute__ ((unused));
|
||||
|
||||
sops.show_options = show_options;
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(HAVE_SHOW_OPTIONS_WITH_DENTRY, 1,
|
||||
[sops->show_options() with dentry])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
])
|
||||
|
|
@ -32,6 +32,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
|
|||
ZFS_AC_KERNEL_CONST_XATTR_HANDLER
|
||||
ZFS_AC_KERNEL_XATTR_HANDLER_GET
|
||||
ZFS_AC_KERNEL_XATTR_HANDLER_SET
|
||||
ZFS_AC_KERNEL_SHOW_OPTIONS
|
||||
ZFS_AC_KERNEL_FSYNC
|
||||
ZFS_AC_KERNEL_EVICT_INODE
|
||||
ZFS_AC_KERNEL_NR_CACHED_OBJECTS
|
||||
|
|
|
|||
|
|
@ -14514,6 +14514,75 @@ fi
|
|||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5
|
||||
$as_echo_n "checking whether sops->show_options() wants dentry... " >&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>
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
int (*show_options) (struct seq_file *, struct dentry *) = NULL;
|
||||
struct super_operations sops __attribute__ ((unused));
|
||||
|
||||
sops.show_options = show_options;
|
||||
|
||||
;
|
||||
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_SHOW_OPTIONS_WITH_DENTRY 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
|
||||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5
|
||||
$as_echo_n "checking whether fops->fsync() wants... " >&6; }
|
||||
|
||||
|
|
@ -19641,6 +19710,75 @@ fi
|
|||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5
|
||||
$as_echo_n "checking whether sops->show_options() wants dentry... " >&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>
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
int (*show_options) (struct seq_file *, struct dentry *) = NULL;
|
||||
struct super_operations sops __attribute__ ((unused));
|
||||
|
||||
sops.show_options = show_options;
|
||||
|
||||
;
|
||||
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_SHOW_OPTIONS_WITH_DENTRY 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
|
||||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5
|
||||
$as_echo_n "checking whether fops->fsync() wants... " >&6; }
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -139,21 +139,31 @@ zpl_remount_fs(struct super_block *sb, int *flags, char *data)
|
|||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* The Linux VFS automatically handles the following flags:
|
||||
* MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, MNT_NOATIME, MNT_READONLY
|
||||
*/
|
||||
#ifdef HAVE_SHOW_OPTIONS_WITH_DENTRY
|
||||
static int
|
||||
zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
|
||||
zpl_show_options(struct seq_file *seq, struct dentry *root)
|
||||
{
|
||||
struct super_block *sb = vfsp->mnt_sb;
|
||||
zfs_sb_t *zsb = sb->s_fs_info;
|
||||
|
||||
/*
|
||||
* The Linux VFS automatically handles the following flags:
|
||||
* MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, MNT_NOATIME, MNT_READONLY
|
||||
*/
|
||||
zfs_sb_t *zsb = root->d_sb->s_fs_info;
|
||||
|
||||
seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
|
||||
|
||||
return (0);
|
||||
}
|
||||
#else
|
||||
static int
|
||||
zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
|
||||
{
|
||||
zfs_sb_t *zsb = vfsp->mnt_sb->s_fs_info;
|
||||
|
||||
seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
|
||||
|
||||
return (0);
|
||||
}
|
||||
#endif /* HAVE_SHOW_OPTIONS_WITH_DENTRY */
|
||||
|
||||
static int
|
||||
zpl_fill_super(struct super_block *sb, void *data, int silent)
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ am__aclocal_m4_deps = \
|
|||
$(top_srcdir)/config/kernel-rq-is_sync.m4 \
|
||||
$(top_srcdir)/config/kernel-security-inode-init.m4 \
|
||||
$(top_srcdir)/config/kernel-set-nlink.m4 \
|
||||
$(top_srcdir)/config/kernel-show-options.m4 \
|
||||
$(top_srcdir)/config/kernel-shrink.m4 \
|
||||
$(top_srcdir)/config/kernel-truncate-setsize.m4 \
|
||||
$(top_srcdir)/config/kernel-xattr-handler.m4 \
|
||||
|
|
|
|||
|
|
@ -165,6 +165,9 @@
|
|||
/* set_nlink() is available */
|
||||
#undef HAVE_SET_NLINK
|
||||
|
||||
/* sops->show_options() with dentry */
|
||||
#undef HAVE_SHOW_OPTIONS_WITH_DENTRY
|
||||
|
||||
/* struct super_block has s_shrink */
|
||||
#undef HAVE_SHRINK
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue