Linux compat 2.6.39: mount_nodev()

The .get_sb callback has been replaced by a .mount callback
in the file_system_type structure.  When using the new
interface the caller must now use the mount_nodev() helper.

Unfortunately, the new interface no longer passes the vfsmount
down to the zfs layers.  This poses a problem for the existing
implementation because we currently save this pointer in the
super block for latter use.  It provides our only entry point
in to the namespace layer for manipulating certain mount options.

This needed to be done originally to allow commands like
'zfs set atime=off tank' to work properly.  It also allowed me
to keep more of the original Solaris code unmodified.  Under
Solaris there is a 1-to-1 mapping between a mount point and a
file system so this is a fairly natural thing to do.  However,
under Linux they many be multiple entries in the namespace
which reference the same filesystem.  Thus keeping a back
reference from the filesystem to the namespace is complicated.

Rather than introduce some ugly hack to get the vfsmount and
continue as before.  I'm leveraging this API change to update
the ZFS code to do things in a more natural way for Linux.
This has the upside that is resolves the compatibility issue
for the long term and fixes several other minor bugs which
have been reported.

This commit updates the code to remove this vfsmount back
reference entirely.  All modifications to filesystem mount
options are now passed in to the kernel via a '-o remount'.
This is the expected Linux mechanism and allows the namespace
to properly handle any options which apply to it before passing
them on to the file system itself.

Aside from fixing the compatibility issue, removing the
vfsmount has had the benefit of simplifying the code.  This
change which fairly involved has turned out nicely.

Closes #246
Closes #217
Closes #187
Closes #248
Closes #231

diff --git a/Makefile.in b/Makefile.in
index 830c43c6d830694d07b7655f6e2935edddc3ceac..2fec9078edc1535d9b6c4b324495bfb52a7ba61d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,6 +76,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 988fefc7a51ebaf51cff76b6bc15dbc9d120352f..eb8c49cce8ed7b60aeeba164254d076fec28c95b 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in
index 7081fe74c04e20cf9b39e8eb24ab22a27e3cd395..690b0ff35a9363aabed054616c07ba7309fe8a99 100644 (file)
--- a/cmd/mount_zfs/Makefile.in
+++ b/cmd/mount_zfs/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index 7173f5698f51fbf095b4df888c50cff53c233008..6a2e9ff3647c856869f5bd0d7d4ad28c09253e33 100644 (file)
--- a/cmd/mount_zfs/mount_zfs.c
+++ b/cmd/mount_zfs/mount_zfs.c
@@ -96,6 +96,7 @@ static const option_map_t option_map[] = {
        { MNTOPT_QUIET,         MS_SILENT,      ZS_COMMENT      },
 #endif
        /* Custom zfs options */
+       { MNTOPT_XATTR,         MS_COMMENT,     ZS_COMMENT      },
        { MNTOPT_NOXATTR,       MS_COMMENT,     ZS_COMMENT      },
        { MNTOPT_ZFSUTIL,       MS_COMMENT,     ZS_ZFSUTIL      },
        { NULL,                 0,              0               } };

diff --git a/cmd/sas_switch_id/Makefile.in b/cmd/sas_switch_id/Makefile.in
index e32e797beab79de00f1816776febb1ba17fbba75..a2d6430cd041c8e74433313e7b49ed1d8a796208 100644 (file)
--- a/cmd/sas_switch_id/Makefile.in
+++ b/cmd/sas_switch_id/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index 18502eba51b085ef3ec76488160f4d1a47f9e27c..0740352dff4648047fe82c4af513d225044e733a 100644 (file)
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index 1a5f4d3b23e723f49d19652672f0e7469715c84b..c2b0c6818974c6f3a61cc5784aa88beddc616763 100644 (file)
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index dffcd2e841fff8b813e5f0dfb89cfc388df9d872..ef106b01623c22ea68fc97ab7b1e2f01af51acdc 100644 (file)
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index 29e63a84a88b3065ca2ac91763450a1042999327..0a94f334b502dc0c361253bf8fbb61dd8a40d696 100644 (file)
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index 1c1481c8c94d2988b1625bf768711a22fa74c7f3..faf33f8e1bc417964778dfcaac1e2bb7953c8f12 100644 (file)
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zpool_id/Makefile.in b/cmd/zpool_id/Makefile.in
index eed2156e47b4d8f4e026ee20275c6ce8b3834033..f56c6159860e2ef9970cf1a4cd0e42b0a7f6ebb2 100644 (file)
--- a/cmd/zpool_id/Makefile.in
+++ b/cmd/zpool_id/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zpool_layout/Makefile.in b/cmd/zpool_layout/Makefile.in
index 3d4f363354d6acc567a814ce7e3ebc78abb6b790..7027914e7f0f41a6e82e02c538de9df8d98c8e98 100644 (file)
--- a/cmd/zpool_layout/Makefile.in
+++ b/cmd/zpool_layout/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index e3718e51074d9e0c4d1666e7a223138e9265cc38..30954f7af0f8477f91619ba36bf80ce4dfcfc05b 100644 (file)
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index 5857046ada4dc4e974e4fde21312e1573282dde1..ba0624d6878a41fd8c079af8efa7e60217d188bb 100644 (file)
--- a/cmd/zvol_id/Makefile.in
+++ b/cmd/zvol_id/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/config/kernel-mount-nodev.m4 b/config/kernel-mount-nodev.m4
new file mode 100644 (file)
index 0000000..9229d5b
--- /dev/null
+++ b/config/kernel-mount-nodev.m4
@@ -0,0 +1,15 @@
+dnl #
+dnl # 2.6.39 API change
+dnl # The .get_sb callback has been replaced by a .mount callback
+dnl # in the file_system_type structure.  When using the new
+dnl # interface the caller must now use the mount_nodev() helper.
+dnl # This updated callback and helper no longer pass the vfsmount.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_MOUNT_NODEV], [
+       ZFS_CHECK_SYMBOL_EXPORT(
+               [mount_nodev],
+               [fs/super.c],
+               [AC_DEFINE(HAVE_MOUNT_NODEV, 1,
+               [mount_nodev() is available])],
+               [])
+])

diff --git a/config/kernel.m4 b/config/kernel.m4
index 8c4b06ac4f17aa57812e7dd64fe1e7a145b86f15..90dc6c00077bb6751600c2f9f024d0e714551c5b 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -39,6 +39,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_CHECK_DISK_SIZE_CHANGE
        ZFS_AC_KERNEL_TRUNCATE_SETSIZE
        ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY
+       ZFS_AC_KERNEL_MOUNT_NODEV
 
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"

diff --git a/configure b/configure
index 49bfb63c92b4c57ea5cbaf49b4565841da713555..497c9931b56847fe335fa18f53ad0583cffa554a 100755 (executable)
--- a/configure
+++ b/configure
@@ -14635,6 +14635,46 @@ fi
        EXTRA_KCFLAGS="$tmp_flags"
 
 
+       { $as_echo "$as_me:$LINENO: checking whether symbol mount_nodev is exported" >&5
+$as_echo_n "checking whether symbol mount_nodev is exported... " >&6; }
+       grep -q -E '[[:space:]]mount_nodev[[:space:]]' \
+               $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+       rc=$?
+       if test $rc -ne 0; then
+               export=0
+               for file in fs/super.c; do
+                       grep -q -E "EXPORT_SYMBOL.*(mount_nodev)" "$LINUX/$file" 2>/dev/null
+                       rc=$?
+                       if test $rc -eq 0; then
+                               export=1
+                               break;
+                       fi
+               done
+               if test $export -eq 0; then
+                       { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+               else
+                       { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MOUNT_NODEV 1
+_ACEOF
+
+               fi
+       else
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MOUNT_NODEV 1
+_ACEOF
+
+       fi
+
+
+
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
        fi
@@ -18869,6 +18909,46 @@ fi
        EXTRA_KCFLAGS="$tmp_flags"
 
 
+       { $as_echo "$as_me:$LINENO: checking whether symbol mount_nodev is exported" >&5
+$as_echo_n "checking whether symbol mount_nodev is exported... " >&6; }
+       grep -q -E '[[:space:]]mount_nodev[[:space:]]' \
+               $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null
+       rc=$?
+       if test $rc -ne 0; then
+               export=0
+               for file in fs/super.c; do
+                       grep -q -E "EXPORT_SYMBOL.*(mount_nodev)" "$LINUX/$file" 2>/dev/null
+                       rc=$?
+                       if test $rc -eq 0; then
+                               export=1
+                               break;
+                       fi
+               done
+               if test $export -eq 0; then
+                       { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+               else
+                       { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MOUNT_NODEV 1
+_ACEOF
+
+               fi
+       else
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MOUNT_NODEV 1
+_ACEOF
+
+       fi
+
+
+
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
        fi

diff --git a/dracut/90zfs/Makefile.in b/dracut/90zfs/Makefile.in
index a88f4399f998ef32b6880b91fb32fb3cdba05c9a..49ed262641f6d7a28920a952e964eb6e64aeb939 100644 (file)
--- a/dracut/90zfs/Makefile.in
+++ b/dracut/90zfs/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/dracut/Makefile.in b/dracut/Makefile.in
index cf9446c76a0cbabe5c6592cdfa21daf1586feccd..9c55888ade4390a36b2c90bb3ccbd81e7e2f60ac 100644 (file)
--- a/dracut/Makefile.in
+++ b/dracut/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 74cb03ced8261e4469776cc6863a88cc24577814..06e5fbedd4ebc3baa38b604be8e5f22fdf57bd6b 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in
index 9475c9c7301d9534f46a20f0f1595cc61582703f..53f5457b6f4609f2b876577813585970881e1873 100644 (file)
--- a/etc/init.d/Makefile.in
+++ b/etc/init.d/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/etc/udev/Makefile.in b/etc/udev/Makefile.in
index c2c2ec18e86f3458bd7d2356d2a62797ffa32c9e..f4754b8ff18da9f2acfeca8fc46b733665c6f6ef 100644 (file)
--- a/etc/udev/Makefile.in
+++ b/etc/udev/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/etc/udev/rules.d/Makefile.in b/etc/udev/rules.d/Makefile.in
index 67145b0a45b02e66e978f9a5269b90160bb05267..98b0d2fdb6e0273f1d84b645f863a0e1a97e50a2 100644 (file)
--- a/etc/udev/rules.d/Makefile.in
+++ b/etc/udev/rules.d/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
index 62bac1b3b6cde90b7c2d624ae4477001a408d1e3..08d1b6a4e32605c185188daddf03ba58aa5bd030 100644 (file)
--- a/etc/zfs/Makefile.in
+++ b/etc/zfs/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/Makefile.in b/include/Makefile.in
index d1533b75e15c23c87232da2c553f14fccf9f60e2..ddb20fcb9d0563b47f1b6bd994e52542a0226087 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/libzfs.h b/include/libzfs.h
index e0c6950432820ae11d07956d856221805fcc64f7..23422b2c964106fedb1a13cebebaf9f509381db5 100644 (file)
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -436,6 +436,7 @@ extern int zfs_prop_get_userquota_int(zfs_handle_t *zhp, const char *propname,
     uint64_t *propvalue);
 extern int zfs_prop_get_userquota(zfs_handle_t *zhp, const char *propname,
     char *propbuf, int proplen, boolean_t literal);
+extern uint64_t getprop_uint64(zfs_handle_t *, zfs_prop_t, char **);
 extern uint64_t zfs_prop_get_int(zfs_handle_t *, zfs_prop_t);
 extern int zfs_prop_inherit(zfs_handle_t *, const char *, boolean_t);
 extern const char *zfs_prop_values(zfs_prop_t);

diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in
index 269613190d0593c6749fdec15439fba5e406eccb..631aade305238c3a2ee41f8f63b1a186dfd9aa8a 100644 (file)
--- a/include/linux/Makefile.in
+++ b/include/linux/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in
index 85f73afdc19537f2e3f0a9d5973436f4abfa9523..954728cc856308ddcadb7ffb9520f550316711c2 100644 (file)
--- a/include/sys/Makefile.in
+++ b/include/sys/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in
index 00f3f9f6910c8a74dc1977c85ab14d205e110f29..05de923fbf9d80df0fc5c92b9957cc09d6cdbf3e 100644 (file)
--- a/include/sys/fm/Makefile.in
+++ b/include/sys/fm/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in
index 3aa7c3e87481bcaecfb0201ccbe1d0e540b8b015..66b516bb24106e0f7bbc07e139e857a5c5d8936e 100644 (file)
--- a/include/sys/fm/fs/Makefile.in
+++ b/include/sys/fm/fs/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in
index bf7f57e4e6d96a70c441a9209547b56ad4069b03..ef905a718a9721db98f1dcad1516726d793156c0 100644 (file)
--- a/include/sys/fs/Makefile.in
+++ b/include/sys/fs/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h
index 7622f0308ee4deed10eb40290d617bb53fa95583..ae5f811c0a5f789b480ee3724680760bfabce3c2 100644 (file)
--- a/include/sys/zfs_vfsops.h
+++ b/include/sys/zfs_vfsops.h
@@ -42,7 +42,6 @@ struct zfs_sb;
 struct znode;
 
 typedef struct zfs_sb {
-       struct vfsmount *z_vfs;         /* generic vfs struct */
        struct super_block *z_sb;       /* generic super_block */
        struct zfs_sb   *z_parent;      /* parent fs */
        objset_t        *z_os;          /* objset reference */
@@ -89,7 +88,7 @@ typedef struct zfs_sb {
 
 #define        ZFS_SUPER_MAGIC 0x2fc12fc1
 
-#define        ZSB_XATTR_USER  0x0001          /* Enable user xattrs */
+#define        ZSB_XATTR       0x0001          /* Enable user xattrs */
 
 
 /*
@@ -182,6 +181,7 @@ extern int zfs_set_version(zfs_sb_t *zsb, uint64_t newvers);
 extern int zfs_sb_create(const char *name, zfs_sb_t **zsbp);
 extern void zfs_sb_free(zfs_sb_t *zsb);
 extern int zfs_check_global_label(const char *dsname, const char *hexsl);
+extern boolean_t zfs_is_readonly(zfs_sb_t *zsb);
 
 extern int zfs_register_callbacks(zfs_sb_t *zsb);
 extern void zfs_unregister_callbacks(zfs_sb_t *zsb);
@@ -190,7 +190,7 @@ extern int zfs_umount(struct super_block *sb);
 extern int zfs_remount(struct super_block *sb, int *flags, char *data);
 extern int zfs_root(zfs_sb_t *zsb, struct inode **ipp);
 extern int zfs_statvfs(struct dentry *dentry, struct kstatfs *statp);
-extern int zfs_vget(struct vfsmount *vfsp, struct inode **ipp, fid_t *fidp);
+extern int zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp);
 
 #ifdef __cplusplus
 }

diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h
index 2f9ca743d97b7710bc7cfae62b9e14a14b0e3e70..6a0c6a4dfb203c22b1d4f6913d8f33668e0e73ed 100644 (file)
--- a/include/sys/zfs_znode.h
+++ b/include/sys/zfs_znode.h
@@ -236,9 +236,8 @@ typedef struct znode {
  */
 #define        ZTOI(znode)     (&((znode)->z_inode))
 #define        ITOZ(inode)     (container_of((inode), znode_t, z_inode))
-#define VTOZSB(vfs)    ((zfs_sb_t *)((vfs)->mnt_sb->s_fs_info))
-#define ZTOZSB(znode)  ((zfs_sb_t *)(ZTOI(znode)->i_sb->s_fs_info))
-#define ITOZSB(inode)  ((zfs_sb_t *)((inode)->i_sb->s_fs_info))
+#define        ZTOZSB(znode)   ((zfs_sb_t *)(ZTOI(znode)->i_sb->s_fs_info))
+#define        ITOZSB(inode)   ((zfs_sb_t *)((inode)->i_sb->s_fs_info))
 
 #define        S_ISDEV(mode)   (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode))
 
@@ -306,7 +305,7 @@ typedef struct znode {
 #define        CONTENT_MODIFIED        (ATTR_MTIME | ATTR_CTIME)
 
 #define        ZFS_ACCESSTIME_STAMP(zsb, zp) \
-       if ((zsb)->z_atime && !((zsb)->z_vfs->mnt_flags & MNT_READONLY)) \
+       if ((zsb)->z_atime && !(zfs_is_readonly(zsb))) \
                zfs_tstamp_update_setup(zp, ACCESSED, NULL, NULL, B_FALSE);
 
 extern int     zfs_init_fs(zfs_sb_t *, znode_t **);

diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index 2770e59b2d66a8aa1f03cac0459ae292701c3594..0aacce8bdf43e7bec2f46918b55a8fac9311227d 100644 (file)
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -51,7 +51,6 @@ extern const struct file_operations zpl_dir_file_operations;
 typedef struct zpl_mount_data {
        const char *z_osname;   /* Dataset name */
        void *z_data;           /* Mount options string */
-       struct vfsmount *z_vfs; /* VFS mount point */
 } zpl_mount_data_t;
 
 extern const struct super_operations zpl_super_operations;

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 418476087356b91a211cec27e31ceecd2fca4bde..107aa7678fc15d8abb3d415ea0926e35395b875a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index 9ab160e438c942158c9a386eb0bb492535da009b..f7a6abd66f6bfa8c9b6faa33ffbdf1790fd395e1 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index 8116a2374a09412b0156adb74bdea567866cc217..f2cb560115ff419e86b1bb1306e737aa2c7efd6c 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 318dcbd04c5906f70304802421623d2558fc7ef0..13e64b5dca2030e2f9026bea13fc73cba5a32241 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 09dd5245c4c99cef7229902374c2d39df58b83fb..fa1ff51f10c1341fa2b24c69807c6032f4fce8ca 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in
index 7e03433f269fd0dd838fb2d96ee182f47875c58d..6aeb054b82d355c3881b7dc809be309abc3ebd03 100644 (file)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in
index 85bebc9b3b12ac78eb1a10ac78535ef78867a47c..c91a2bb7f355302b1c102e664f31c5628ad5b546 100644 (file)
--- a/lib/libspl/asm-i386/Makefile.in
+++ b/lib/libspl/asm-i386/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in
index b6b9bed8fbc5d52e2e68f4dd1487812e1b5d79b9..7afeb56d812b560ae1140371a562debf243fb9f7 100644 (file)
--- a/lib/libspl/asm-x86_64/Makefile.in
+++ b/lib/libspl/asm-x86_64/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in
index b2de0ad142e9d8be3589f8d709ddc122cb189db1..5708683ff54c3e27bf641b10fae307b9ed5d25df 100644 (file)
--- a/lib/libspl/include/Makefile.in
+++ b/lib/libspl/include/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/ia32/Makefile.in b/lib/libspl/include/ia32/Makefile.in
index d68fa7b7421cd4c12eba85bcb82dde8dd95eaac4..7a6e4862e6d45b4ae8ebebecb305f4bd5db0100f 100644 (file)
--- a/lib/libspl/include/ia32/Makefile.in
+++ b/lib/libspl/include/ia32/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/ia32/sys/Makefile.in b/lib/libspl/include/ia32/sys/Makefile.in
index 30b81de3369f82420f48abe998df07e63028d40a..2637df9cb760353a11055bba2eb9be2ad06b425b 100644 (file)
--- a/lib/libspl/include/ia32/sys/Makefile.in
+++ b/lib/libspl/include/ia32/sys/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/rpc/Makefile.in b/lib/libspl/include/rpc/Makefile.in
index 3b1270e587b5970abc54b515d206cf3cde086e2f..9561e97a2eb65113d3193502ff9b4e558c8df538 100644 (file)
--- a/lib/libspl/include/rpc/Makefile.in
+++ b/lib/libspl/include/rpc/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/sys/Makefile.in b/lib/libspl/include/sys/Makefile.in
index ccfefaa5de4fad6c4d6a7f3b95f2d4c80f2139c8..503fefb5af52fd27e408424b6347467207289862 100644 (file)
--- a/lib/libspl/include/sys/Makefile.in
+++ b/lib/libspl/include/sys/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/sys/dktp/Makefile.in b/lib/libspl/include/sys/dktp/Makefile.in
index 9eed96c9d5bd87839be9c0eb0bf5b2deeff1b18f..40d4e0c447160adc4a18531c1acb813874b32fcf 100644 (file)
--- a/lib/libspl/include/sys/dktp/Makefile.in
+++ b/lib/libspl/include/sys/dktp/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/sys/mntent.h b/lib/libspl/include/sys/mntent.h
index 1cbdc3aeb523785af8b8caac98ce638e47551e9f..8fad65b56f86a3affe605fa6cf27d7a3bdfba4ff 100644 (file)
--- a/lib/libspl/include/sys/mntent.h
+++ b/lib/libspl/include/sys/mntent.h
@@ -88,8 +88,8 @@
 #define        MNTOPT_LOUD     "loud"          /* verbose mount */
 #define        MNTOPT_BIND     "bind"          /* remount part of a tree */
 #define        MNTOPT_RBIND    "rbind"         /* include subtrees */
-#define        MNTOPT_XATTR    "user_xattr"    /* enable extended attributes */
-#define        MNTOPT_NOXATTR  "nouser_xattr"  /* disable extended attributes */
+#define        MNTOPT_XATTR    "xattr"         /* enable extended attributes */
+#define        MNTOPT_NOXATTR  "noxattr"       /* disable extended attributes */
 #define        MNTOPT_COMMENT  "comment"       /* comment */
 #define        MNTOPT_ZFSUTIL  "zfsutil"       /* called by zfs utility */
 

diff --git a/lib/libspl/include/sys/sysevent/Makefile.in b/lib/libspl/include/sys/sysevent/Makefile.in
index 83ce2b2faecd9d670c681b97a2d0d8be1f2f3e87..ed9f563ccaa380cfa74b653ee1ad3a3f9fc595d3 100644 (file)
--- a/lib/libspl/include/sys/sysevent/Makefile.in
+++ b/lib/libspl/include/sys/sysevent/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libspl/include/util/Makefile.in b/lib/libspl/include/util/Makefile.in
index 1339ebc48c4b9207797d23bed7b464618af1a3a2..2a2a0c16d20024b445e755271aaa994cf24fc5ef 100644 (file)
--- a/lib/libspl/include/util/Makefile.in
+++ b/lib/libspl/include/util/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index 48a7100207f0d48ec8abd723d9dd54525eac8821..6d1ffb432b7296f2d509312c1d5a9e29944e31cb 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index bd224872dbee4ee5c1d017d42926aefcfd6f06de..8678411c8f6c4c8c4a9734ab232e8c39b2e96872 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index d73e8eb8b71a2a50f660a9ceebad31dd789c7064..73ec60585f5d59a89e3f938a8fe02feb59261604 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 378bbc7b1829d680f8ba059999504a4aa80d41f5..5f8847a931052f28da8cb9773f392a54429afe4d 100644 (file)
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -1313,6 +1313,25 @@ zfs_setprop_error(libzfs_handle_t *hdl, zfs_prop_t prop, int err,
        }
 }
 
+static boolean_t
+zfs_is_namespace_prop(zfs_prop_t prop)
+{
+       switch (prop) {
+
+       case ZFS_PROP_ATIME:
+       case ZFS_PROP_DEVICES:
+       case ZFS_PROP_EXEC:
+       case ZFS_PROP_SETUID:
+       case ZFS_PROP_READONLY:
+       case ZFS_PROP_XATTR:
+       case ZFS_PROP_NBMAND:
+               return (B_TRUE);
+
+       default:
+               return (B_FALSE);
+       }
+}
+
 /*
  * Given a property name and value, set the property for the given dataset.
  */
@@ -1408,12 +1427,22 @@ zfs_prop_set(zfs_handle_t *zhp, const char *propname, const char *propval)
                if (do_prefix)
                        ret = changelist_postfix(cl);
 
-               /*
-                * Refresh the statistics so the new property value
-                * is reflected.
-                */
-               if (ret == 0)
+               if (ret == 0) {
+                       /*
+                        * Refresh the statistics so the new property
+                        * value is reflected.
+                        */
                        (void) get_stats(zhp);
+
+                       /*
+                        * Remount the filesystem to propagate the change
+                        * if one of the options handled by the generic
+                        * Linux namespace layer has been modified.
+                        */
+                       if (zfs_is_namespace_prop(prop) &&
+                           zfs_is_mounted(zhp, NULL))
+                               ret = zfs_mount(zhp, MNTOPT_REMOUNT, 0);
+               }
        }
 
 error:
@@ -1530,7 +1559,7 @@ error:
  * True DSL properties are stored in an nvlist.  The following two functions
  * extract them appropriately.
  */
-static uint64_t
+uint64_t
 getprop_uint64(zfs_handle_t *zhp, zfs_prop_t prop, char **source)
 {
        nvlist_t *nv;

diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index 1dc58f924a3eab48e9d81a249322da1f754c8a03..6b70cbbec28da5680e0435f7112dd422e3eb2805 100644 (file)
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -315,6 +315,52 @@ do_unmount(const char *mntpt, int flags)
        return (rc ? EINVAL : 0);
 }
 
+static int
+zfs_add_option(zfs_handle_t *zhp, char *options, int len,
+    zfs_prop_t prop, char *on, char *off)
+{
+       char *source;
+       uint64_t value;
+
+       /* Skip adding duplicate default options */
+       if ((strstr(options, on) != NULL) || (strstr(options, off) != NULL))
+               return (0);
+
+       /*
+        * zfs_prop_get_int() to not used to ensure our mount options
+        * are not influenced by the current /etc/mtab contents.
+        */
+       value = getprop_uint64(zhp, prop, &source);
+
+       (void) strlcat(options, ",", len);
+       (void) strlcat(options, value ? on : off, len);
+
+       return (0);
+}
+
+static int
+zfs_add_options(zfs_handle_t *zhp, char *options, int len)
+{
+       int error = 0;
+
+       error = zfs_add_option(zhp, options, len,
+           ZFS_PROP_ATIME, MNTOPT_ATIME, MNTOPT_NOATIME);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_DEVICES, MNTOPT_DEVICES, MNTOPT_NODEVICES);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_EXEC, MNTOPT_EXEC, MNTOPT_NOEXEC);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_READONLY, MNTOPT_RO, MNTOPT_RW);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_SETUID, MNTOPT_SETUID, MNTOPT_NOSETUID);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_XATTR, MNTOPT_XATTR, MNTOPT_NOXATTR);
+       error = error ? error : zfs_add_option(zhp, options, len,
+           ZFS_PROP_NBMAND, MNTOPT_NBMAND, MNTOPT_NONBMAND);
+
+       return (error);
+}
+
 /*
  * Mount the given filesystem.
  */
@@ -325,12 +371,16 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags)
        char mountpoint[ZFS_MAXPROPLEN];
        char mntopts[MNT_LINE_MAX];
        libzfs_handle_t *hdl = zhp->zfs_hdl;
-       int rc;
+       int remount = 0, rc;
 
-       if (options == NULL)
+       if (options == NULL) {
                (void) strlcpy(mntopts, MNTOPT_DEFAULTS, sizeof (mntopts));
-       else
+       } else {
                (void) strlcpy(mntopts, options, sizeof (mntopts));
+       }
+
+       if (strstr(mntopts, MNTOPT_REMOUNT) != NULL)
+               remount = 1;
 
        /*
         * If the pool is imported read-only then all mounts must be read-only
@@ -338,6 +388,22 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags)
        if (zpool_get_prop_int(zhp->zpool_hdl, ZPOOL_PROP_READONLY, NULL))
                (void) strlcat(mntopts, "," MNTOPT_RO, sizeof (mntopts));
 
+       /*
+        * Append default mount options which apply to the mount point.
+        * This is done because under Linux (unlike Solaris) multiple mount
+        * points may reference a single super block.  This means that just
+        * given a super block there is no back reference to update the per
+        * mount point options.
+        */
+       rc = zfs_add_options(zhp, mntopts, sizeof (mntopts));
+       if (rc) {
+               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                   "default options unavailable"));
+               return (zfs_error_fmt(hdl, EZFS_MOUNTFAILED,
+                   dgettext(TEXT_DOMAIN, "cannot mount '%s'"),
+                   mountpoint));
+       }
+
        /*
         * Append zfsutil option so the mount helper allow the mount
         */
@@ -361,8 +427,7 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags)
         * Determine if the mountpoint is empty.  If so, refuse to perform the
         * mount.  We don't perform this check if 'remount' is specified.
         */
-       if (strstr(mntopts, MNTOPT_REMOUNT) == NULL &&
-           !dir_is_empty(mountpoint)) {
+       if (!remount && !dir_is_empty(mountpoint)) {
                zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
                    "directory is not empty"));
                return (zfs_error_fmt(hdl, EZFS_MOUNTFAILED,
@@ -403,6 +468,10 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags)
                    zhp->zfs_name));
        }
 
+       /* remove the mounted entry before re-adding on remount */
+       if (remount)
+               libzfs_mnttab_remove(hdl, zhp->zfs_name);
+
        /* add the mounted entry into our cache */
        libzfs_mnttab_add(hdl, zfs_get_name(zhp), mountpoint, mntopts);
        return (0);

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 0245bb16a76bbc805745715ee4dd87879ec4aaf8..db27fd5c16413a7a26831a8c5ee3ed6488fd84f7 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/man/Makefile.in b/man/Makefile.in
index 781ef472158e0f6cd611f015a3f0dd8c5276a050..2353d7e1642e08be988a0cfb04112bc78b97812b 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in
index 2935d88d4c5e73f6fd930b5045d4c360252f94a2..d153fb515165ae294c795721d69e7bb48ca90a4b 100644 (file)
--- a/man/man8/Makefile.in
+++ b/man/man8/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c
index 0ae749e6b4dda058d31d5aa8273c72dbeeb96073..40f792b6c9ca80de325096638bf76e55f35b0ace 100644 (file)
--- a/module/zfs/zfs_acl.c
+++ b/module/zfs/zfs_acl.c
@@ -2136,8 +2136,7 @@ top:
 static int
 zfs_zaccess_dataset_check(znode_t *zp, uint32_t v4_mode)
 {
-       if ((v4_mode & WRITE_MASK) &&
-           (ZTOZSB(zp)->z_vfs->mnt_flags & MNT_READONLY) &&
+       if ((v4_mode & WRITE_MASK) && (zfs_is_readonly(ZTOZSB(zp))) &&
            (!S_ISDEV(ZTOI(zp)->i_mode) ||
            (S_ISDEV(ZTOI(zp)->i_mode) && (v4_mode & WRITE_MASK_ATTRS)))) {
                return (EROFS);

diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c
index 0df7cc1f83d8cbdcc265fbf1d8a20a722bc7a860..47550ec63915107587f6baef82b44ac5dfecb414 100644 (file)
--- a/module/zfs/zfs_dir.c
+++ b/module/zfs/zfs_dir.c
@@ -1045,7 +1045,7 @@ top:
                return (ENOENT);
        }
 
-       if (zsb->z_vfs->mnt_flags & MNT_READONLY) {
+       if (zfs_is_readonly(zsb)) {
                zfs_dirent_unlock(dl);
                return (EROFS);
        }

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 39c60915ea50ef4a56e10a1b95ab7b797231b07d..b50f02383af4064b3b365ca942bd12e3d776973c 100644 (file)
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -1107,8 +1107,9 @@ get_zfs_sb(const char *dsname, zfs_sb_t **zsbp)
 
        mutex_enter(&os->os_user_ptr_lock);
        *zsbp = dmu_objset_get_user(os);
-       if (*zsbp) {
-               mntget((*zsbp)->z_vfs);
+       if (*zsbp && (*zsbp)->z_sb) {
+               if (atomic_inc_not_zero(&((*zsbp)->z_sb->s_active)))
+                       error = ESRCH;
        } else {
                error = ESRCH;
        }
@@ -1119,7 +1120,7 @@ get_zfs_sb(const char *dsname, zfs_sb_t **zsbp)
 
 /*
  * Find a zfs_sb_t for a mounted filesystem, or create our own, in which
- * case its z_vfs will be NULL, and it will be opened as the owner.
+ * case its z_sb will be NULL, and it will be opened as the owner.
  */
 static int
 zfs_sb_hold(const char *name, void *tag, zfs_sb_t **zsbp, boolean_t writer)
@@ -1149,8 +1150,8 @@ zfs_sb_rele(zfs_sb_t *zsb, void *tag)
 {
        rrw_exit(&zsb->z_teardown_lock, tag);
 
-       if (zsb->z_vfs) {
-               mntput(zsb->z_vfs);
+       if (zsb->z_sb) {
+               deactivate_super(zsb->z_sb);
        } else {
                dmu_objset_disown(zsb->z_os, zsb);
                zfs_sb_free(zsb);
@@ -3239,7 +3240,7 @@ zfs_ioc_rollback(zfs_cmd_t *zc)
                        resume_err = zfs_resume_fs(zsb, zc->zc_name);
                        error = error ? error : resume_err;
                }
-               mntput(zsb->z_vfs);
+               deactivate_super(zsb->z_sb);
        } else {
                if (dsl_dataset_tryown(ds, B_FALSE, FTAG)) {
                        error = dsl_dataset_clone_swap(clone, ds, B_TRUE);
@@ -3724,7 +3725,7 @@ zfs_ioc_recv(zfs_cmd_t *zc)
                        if (error == 0)
                                error = zfs_resume_fs(zsb, tofs);
                        error = error ? error : end_err;
-                       mntput(zsb->z_vfs);
+                       deactivate_super(zsb->z_sb);
                } else {
                        error = dmu_recv_end(&drc);
                }
@@ -4137,7 +4138,7 @@ zfs_ioc_userspace_upgrade(zfs_cmd_t *zc)
                }
                if (error == 0)
                        error = dmu_objset_userspace_upgrade(zsb->z_os);
-               mntput(zsb->z_vfs);
+               deactivate_super(zsb->z_sb);
        } else {
                /* XXX kind of reading contents without owning */
                error = dmu_objset_hold(zc->zc_name, FTAG, &os);

diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index 2575638870528545e42a78d6fab2dffb154d0672..e0987e9191026a023946a0249f17d2acebcf893f 100644 (file)
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -122,22 +122,17 @@ zfs_sync(struct super_block *sb, int wait, cred_t *cr)
 }
 EXPORT_SYMBOL(zfs_sync);
 
+boolean_t
+zfs_is_readonly(zfs_sb_t *zsb)
+{
+       return (!!(zsb->z_sb->s_flags & MS_RDONLY));
+}
+EXPORT_SYMBOL(zfs_is_readonly);
+
 static void
 atime_changed_cb(void *arg, uint64_t newval)
 {
-       zfs_sb_t *zsb = arg;
-       struct super_block *sb = zsb->z_sb;
-       struct vfsmount *vfs = zsb->z_vfs;
-
-       if (newval == TRUE) {
-               vfs->mnt_flags &= ~MNT_NOATIME;
-               sb->s_flags &= ~MS_NOATIME;
-               zsb->z_atime = TRUE;
-       } else {
-               vfs->mnt_flags |= MNT_NOATIME;
-               sb->s_flags |= MS_NOATIME;
-               zsb->z_atime = FALSE;
-       }
+       ((zfs_sb_t *)arg)->z_atime = newval;
 }
 
 static void
@@ -145,11 +140,10 @@ xattr_changed_cb(void *arg, uint64_t newval)
 {
        zfs_sb_t *zsb = arg;
 
-       if (newval == TRUE) {
-               zsb->z_flags |= ZSB_XATTR_USER;
-       } else {
-               zsb->z_flags &= ~ZSB_XATTR_USER;
-       }
+       if (newval == TRUE)
+               zsb->z_flags |= ZSB_XATTR;
+       else
+               zsb->z_flags &= ~ZSB_XATTR;
 }
 
 static void
@@ -169,84 +163,44 @@ readonly_changed_cb(void *arg, uint64_t newval)
 {
        zfs_sb_t *zsb = arg;
        struct super_block *sb = zsb->z_sb;
-       struct vfsmount *vfs = zsb->z_vfs;
 
-       if (newval) {
-               vfs->mnt_flags |= MNT_READONLY;
+       if (sb == NULL)
+               return;
+
+       if (newval)
                sb->s_flags |= MS_RDONLY;
-       } else {
-               vfs->mnt_flags &= ~MNT_READONLY;
+       else
                sb->s_flags &= ~MS_RDONLY;
-       }
 }
 
 static void
 devices_changed_cb(void *arg, uint64_t newval)
 {
-       zfs_sb_t *zsb = arg;
-       struct super_block *sb = zsb->z_sb;
-       struct vfsmount *vfs = zsb->z_vfs;
-
-       if (newval == FALSE) {
-               vfs->mnt_flags |= MNT_NODEV;
-               sb->s_flags |= MS_NODEV;
-       } else {
-               vfs->mnt_flags &= ~MNT_NODEV;
-               sb->s_flags &= ~MS_NODEV;
-       }
 }
 
 static void
 setuid_changed_cb(void *arg, uint64_t newval)
 {
-       zfs_sb_t *zsb = arg;
-       struct super_block *sb = zsb->z_sb;
-       struct vfsmount *vfs = zsb->z_vfs;
-
-       if (newval == FALSE) {
-               vfs->mnt_flags |= MNT_NOSUID;
-               sb->s_flags |= MS_NOSUID;
-       } else {
-               vfs->mnt_flags &= ~MNT_NOSUID;
-               sb->s_flags &= ~MS_NOSUID;
-       }
 }
 
 static void
 exec_changed_cb(void *arg, uint64_t newval)
 {
-       zfs_sb_t *zsb = arg;
-       struct super_block *sb = zsb->z_sb;
-       struct vfsmount *vfs = zsb->z_vfs;
-
-       if (newval == FALSE) {
-               vfs->mnt_flags |= MNT_NOEXEC;
-               sb->s_flags |= MS_NOEXEC;
-       } else {
-               vfs->mnt_flags &= ~MNT_NOEXEC;
-               sb->s_flags &= ~MS_NOEXEC;
-       }
 }
 
-/*
- * The nbmand mount option can be changed at mount time.
- * We can't allow it to be toggled on live file systems or incorrect
- * behavior may be seen from cifs clients
- *
- * This property isn't registered via dsl_prop_register(), but this callback
- * will be called when a file system is first mounted
- */
 static void
 nbmand_changed_cb(void *arg, uint64_t newval)
 {
        zfs_sb_t *zsb = arg;
        struct super_block *sb = zsb->z_sb;
 
-       if (newval == TRUE) {
+       if (sb == NULL)
+               return;
+
+       if (newval == TRUE)
                sb->s_flags |= MS_MANDLOCK;
-       } else {
+       else
                sb->s_flags &= ~MS_MANDLOCK;
-       }
 }
 
 static void
@@ -270,58 +224,12 @@ acl_inherit_changed_cb(void *arg, uint64_t newval)
 int
 zfs_register_callbacks(zfs_sb_t *zsb)
 {
-       struct vfsmount *vfsp = zsb->z_vfs;
        struct dsl_dataset *ds = NULL;
        objset_t *os = zsb->z_os;
-       uint64_t nbmand;
-       boolean_t readonly = B_FALSE;
-       boolean_t setuid = B_TRUE;
-       boolean_t exec = B_TRUE;
-       boolean_t devices = B_TRUE;
-       boolean_t xattr = B_TRUE;
-       boolean_t atime = B_TRUE;
-       char osname[MAXNAMELEN];
        int error = 0;
 
-       /*
-        * While Linux allows multiple vfs mounts per super block we have
-        * limited it artificially to one in zfs_fill_super.  Thus it is
-        * safe for us to modify the vfs mount fails through the callbacks.
-        */
-       if ((vfsp->mnt_flags & MNT_READONLY) ||
-           !spa_writeable(dmu_objset_spa(os)))
-               readonly = B_TRUE;
-
-       if (vfsp->mnt_flags & MNT_NOSUID) {
-               devices = B_FALSE;
-               setuid = B_FALSE;
-       } else {
-               if (vfsp->mnt_flags & MNT_NODEV)
-                       devices = B_FALSE;
-       }
-
-       if (vfsp->mnt_flags & MNT_NOEXEC)
-               exec = B_FALSE;
-
-       if (vfsp->mnt_flags & MNT_NOATIME)
-               atime = B_FALSE;
-
-       /*
-        * nbmand is a special property which may only be changed at
-        * mount time.  Unfortunately, Linux does not have a VFS mount
-        * flag instead this is a super block flag.  So setting this
-        * option at mount time will have to wait until we can parse
-        * the mount option string.  For now we rely on the nbmand
-        * value stored with the object set.  Additional mount option
-        * string to be handled:
-        *
-        *   case: sensitive|insensitive|mixed
-        *   zerocopy: on|off
-        */
-
-       dmu_objset_name(os, osname);
-       if ((error = dsl_prop_get_integer(osname, "nbmand", &nbmand, NULL)))
-               return (error);
+       if (zfs_is_readonly(zsb) || !spa_writeable(dmu_objset_spa(os)))
+               readonly_changed_cb(zsb, B_TRUE);
 
        /*
         * Register property callbacks.
@@ -351,20 +259,11 @@ zfs_register_callbacks(zfs_sb_t *zsb)
            "aclinherit", acl_inherit_changed_cb, zsb);
        error = error ? error : dsl_prop_register(ds,
            "vscan", vscan_changed_cb, zsb);
+       error = error ? error : dsl_prop_register(ds,
+           "nbmand", nbmand_changed_cb, zsb);
        if (error)
                goto unregister;
 
-       /*
-        * Invoke our callbacks to set required flags.
-        */
-       readonly_changed_cb(zsb, readonly);
-       setuid_changed_cb(zsb, setuid);
-       exec_changed_cb(zsb, exec);
-       devices_changed_cb(zsb, devices);
-       xattr_changed_cb(zsb, xattr);
-       atime_changed_cb(zsb, atime);
-       nbmand_changed_cb(zsb, nbmand);
-
        return (0);
 
 unregister:
@@ -384,6 +283,7 @@ unregister:
        (void) dsl_prop_unregister(ds, "aclinherit", acl_inherit_changed_cb,
            zsb);
        (void) dsl_prop_unregister(ds, "vscan", vscan_changed_cb, zsb);
+       (void) dsl_prop_unregister(ds, "nbmand", nbmand_changed_cb, zsb);
 
        return (error);
 }
@@ -694,7 +594,7 @@ zfs_sb_create(const char *osname, zfs_sb_t **zsbp)
         * Should probably make this a kmem cache, shuffle fields,
         * and just bzero up to z_hold_mtx[].
         */
-       zsb->z_vfs = NULL;
+       zsb->z_sb = NULL;
        zsb->z_parent = zsb;
        zsb->z_max_blksz = SPA_MAXBLOCKSIZE;
        zsb->z_show_ctldir = ZFS_SNAPDIR_VISIBLE;
@@ -840,9 +740,9 @@ zfs_sb_setup(zfs_sb_t *zsb, boolean_t mounting)
                 * During replay we remove the read only flag to
                 * allow replays to succeed.
                 */
-               readonly = zsb->z_vfs->mnt_flags & MNT_READONLY;
+               readonly = zfs_is_readonly(zsb);
                if (readonly != 0)
-                       zsb->z_vfs->mnt_flags &= ~MNT_READONLY;
+                       readonly_changed_cb(zsb, B_FALSE);
                else
                        zfs_unlinked_drain(zsb);
 
@@ -883,7 +783,10 @@ zfs_sb_setup(zfs_sb_t *zsb, boolean_t mounting)
                                zsb->z_replay = B_FALSE;
                        }
                }
-               zsb->z_vfs->mnt_flags |= readonly; /* restore readonly bit */
+
+               /* restore readonly bit */
+               if (readonly != 0)
+                       readonly_changed_cb(zsb, B_TRUE);
        }
 
        return (0);
@@ -954,6 +857,9 @@ zfs_unregister_callbacks(zfs_sb_t *zsb)
 
                VERIFY(dsl_prop_unregister(ds, "vscan",
                    vscan_changed_cb, zsb) == 0);
+
+               VERIFY(dsl_prop_unregister(ds, "nbmand",
+                   nbmand_changed_cb, zsb) == 0);
        }
 }
 EXPORT_SYMBOL(zfs_unregister_callbacks);
@@ -1164,7 +1070,7 @@ zfsvfs_teardown(zfs_sb_t *zsb, boolean_t unmounting)
         * Evict cached data
         */
        if (dmu_objset_is_dirty_anywhere(zsb->z_os))
-               if (!(zsb->z_vfs->mnt_flags & MNT_READONLY))
+               if (!zfs_is_readonly(zsb))
                        txg_wait_synced(dmu_objset_pool(zsb->z_os), 0);
        (void) dmu_objset_evict_dbufs(zsb->z_os);
 
@@ -1181,17 +1087,6 @@ zfs_domount(struct super_block *sb, void *data, int silent)
        uint64_t recordsize;
        int error;
 
-       /*
-        * Linux allows multiple vfs mounts per super block.  However, the
-        * zfs_sb_t only contains a pointer for a single vfs mount.  This
-        * back reference in the long term could be extended to a list of
-        * vfs mounts if a hook were added to the kernel to notify us when
-        * a vfsmount is destroyed.  Until then we must limit the number
-        * of mounts per super block to one.
-        */
-       if (atomic_read(&sb->s_active) > 1)
-               return (EBUSY);
-
        error = zfs_sb_create(osname, &zsb);
        if (error)
                return (error);
@@ -1201,7 +1096,6 @@ zfs_domount(struct super_block *sb, void *data, int silent)
                goto out;
 
        zsb->z_sb = sb;
-       zsb->z_vfs = zmd->z_vfs;
        sb->s_fs_info = zsb;
        sb->s_magic = ZFS_SUPER_MAGIC;
        sb->s_maxbytes = MAX_LFS_FILESIZE;
@@ -1298,47 +1192,18 @@ EXPORT_SYMBOL(zfs_umount);
 int
 zfs_remount(struct super_block *sb, int *flags, char *data)
 {
-       zfs_sb_t *zsb = sb->s_fs_info;
-       boolean_t readonly = B_FALSE;
-       boolean_t setuid = B_TRUE;
-       boolean_t exec = B_TRUE;
-       boolean_t devices = B_TRUE;
-       boolean_t atime = B_TRUE;
-
-       if (*flags & MS_RDONLY)
-               readonly = B_TRUE;
-
-       if (*flags & MS_NOSUID) {
-               devices = B_FALSE;
-               setuid = B_FALSE;
-       } else {
-               if (*flags & MS_NODEV)
-                       devices = B_FALSE;
-       }
-
-       if (*flags & MS_NOEXEC)
-               exec = B_FALSE;
-
-       if (*flags & MS_NOATIME)
-               atime = B_FALSE;
-
        /*
-        * Invoke our callbacks to set required flags.
+        * All namespace flags (MNT_*) and super block flags (MS_*) will
+        * be handled by the Linux VFS.  Only handle custom options here.
         */
-       readonly_changed_cb(zsb, readonly);
-       setuid_changed_cb(zsb, setuid);
-       exec_changed_cb(zsb, exec);
-       devices_changed_cb(zsb, devices);
-       atime_changed_cb(zsb, atime);
-
        return (0);
 }
 EXPORT_SYMBOL(zfs_remount);
 
 int
-zfs_vget(struct vfsmount *vfsp, struct inode **ipp, fid_t *fidp)
+zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp)
 {
-       zfs_sb_t        *zsb = VTOZSB(vfsp);
+       zfs_sb_t        *zsb = sb->s_fs_info;
        znode_t         *zp;
        uint64_t        object = 0;
        uint64_t        fid_gen = 0;

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 21397131025ceb27d92ffa6601e2aabb0412a08c..c32b2a39f8da8184053c566004e8cdc199279be9 100644 (file)
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -1122,7 +1122,7 @@ zfs_lookup(struct inode *dip, char *nm, struct inode **ipp, int flags,
                /*
                 * If the xattr property is off, refuse the lookup request.
                 */
-               if (!(zsb->z_flags & ZSB_XATTR_USER)) {
+               if (!(zsb->z_flags & ZSB_XATTR)) {
                        ZFS_EXIT(zsb);
                        return (EINVAL);
                }
@@ -2420,7 +2420,7 @@ top:
        aclp = NULL;
 
        /* Can this be moved to before the top label? */
-       if (zsb->z_vfs->mnt_flags & MNT_READONLY) {
+       if (zfs_is_readonly(zsb)) {
                err = EROFS;
                goto out3;
        }

diff --git a/module/zfs/zpl_export.c b/module/zfs/zpl_export.c
index a3895560048979fe57c825d9c9d3b3a72de61359..4fe998437f6aadfaa339e52f406f3c26ab1619fe 100644 (file)
--- a/module/zfs/zpl_export.c
+++ b/module/zfs/zpl_export.c
@@ -73,8 +73,6 @@ static struct dentry *
 zpl_fh_to_dentry(struct super_block *sb, struct fid *fh,
     int fh_len, int fh_type)
 {
-       zfs_sb_t *zsb = sb->s_fs_info;
-       struct vfsmount *vfs = zsb->z_vfs;
        fid_t *fid = (fid_t *)fh;
        struct inode *ip;
        int len_bytes, rc;
@@ -86,7 +84,7 @@ zpl_fh_to_dentry(struct super_block *sb, struct fid *fh,
            len_bytes < offsetof(fid_t, fid_data) + fid->fid_len)
                return ERR_PTR(-EINVAL);
 
-       rc = zfs_vget(vfs, &ip, fid);
+       rc = zfs_vget(sb, &ip, fid);
 
        if (rc != 0)
                return ERR_PTR(-rc);

diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
index 304f708c326b1935f28f058c60f36ef85abc8033..650e9c0d3791639851c5a29e47f87af43f226227 100644 (file)
--- a/module/zfs/zpl_super.c
+++ b/module/zfs/zpl_super.c
@@ -150,8 +150,7 @@ zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
         * MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, MNT_NOATIME, MNT_READONLY
         */
 
-       if (zsb->z_flags & ZSB_XATTR_USER)
-               seq_printf(seq, ",%s", "xattr");
+       seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr");
 
        return (0);
 }
@@ -167,14 +166,25 @@ zpl_fill_super(struct super_block *sb, void *data, int silent)
        return (error);
 }
 
+#ifdef HAVE_MOUNT_NODEV
+static struct dentry *
+zpl_mount(struct file_system_type *fs_type, int flags,
+    const char *osname, void *data)
+{
+       zpl_mount_data_t zmd = { osname, data };
+
+       return mount_nodev(fs_type, flags, &zmd, zpl_fill_super);
+}
+#else
 static int
 zpl_get_sb(struct file_system_type *fs_type, int flags,
     const char *osname, void *data, struct vfsmount *mnt)
 {
-       zpl_mount_data_t zmd = { osname, data, mnt };
+       zpl_mount_data_t zmd = { osname, data };
 
        return get_sb_nodev(fs_type, flags, &zmd, zpl_fill_super, mnt);
 }
+#endif /* HAVE_MOUNT_NODEV */
 
 static void
 zpl_kill_sb(struct super_block *sb)
@@ -213,6 +223,10 @@ const struct super_operations zpl_super_operations = {
 struct file_system_type zpl_fs_type = {
        .owner          = THIS_MODULE,
        .name           = ZFS_DRIVER,
+#ifdef HAVE_MOUNT_NODEV
+       .mount          = zpl_mount,
+#else
        .get_sb         = zpl_get_sb,
+#endif /* HAVE_MOUNT_NODEV */
        .kill_sb        = zpl_kill_sb,
 };

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index f274407e5930f02e79c09d0e16ab4a9f6078ddd9..cf52e720d96468050c5ec957919f739c960e3d8c 100644 (file)
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -83,7 +83,7 @@ zpl_xattr_filldir(void *arg, const char *name, int name_len,
        xattr_filldir_t *xf = arg;
 
        if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))
-               if (!(ITOZSB(xf->inode)->z_flags & ZSB_XATTR_USER))
+               if (!(ITOZSB(xf->inode)->z_flags & ZSB_XATTR))
                        return (0);
 
        if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
@@ -281,7 +281,7 @@ __zpl_xattr_user_get(struct inode *ip, const char *name,
        if (strcmp(name, "") == 0)
                return -EINVAL;
 
-       if (!(ITOZSB(ip)->z_flags & ZSB_XATTR_USER))
+       if (!(ITOZSB(ip)->z_flags & ZSB_XATTR))
                return -EOPNOTSUPP;
 
        xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name);
@@ -302,7 +302,7 @@ __zpl_xattr_user_set(struct inode *ip, const char *name,
        if (strcmp(name, "") == 0)
                return -EINVAL;
 
-       if (!(ITOZSB(ip)->z_flags & ZSB_XATTR_USER))
+       if (!(ITOZSB(ip)->z_flags & ZSB_XATTR))
                return -EOPNOTSUPP;
 
        xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name);

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 1770e23cf09e4f9d3ab0cc2a163794b80626a280..d457890e3efc99061c44e7d9428ac9cdfa39100b 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in
index 725ba10e44a1698ce8d3335e1bcef552de1609ee..d1aa099b7538b0a743fe97fd2b9057765c95924c 100644 (file)
--- a/scripts/zpios-profile/Makefile.in
+++ b/scripts/zpios-profile/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in
index 4394d57f949d0136d04505b23efd4209861986c2..02aa93d52aac8d610206d5c862070d3d43b188fe 100644 (file)
--- a/scripts/zpios-test/Makefile.in
+++ b/scripts/zpios-test/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in
index 4b6f7b80e0cdfd5032d90f63a2cb1e5ef93621f2..afc7de76e1aa92bbec7e1e86dc3b3af27a2319eb 100644 (file)
--- a/scripts/zpool-config/Makefile.in
+++ b/scripts/zpool-config/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/scripts/zpool-layout/Makefile.in b/scripts/zpool-layout/Makefile.in
index 8cff1723223bb133721ef0dda593a59344fce6c5..4cfbc755ae361568cf2860435494f6b10f3bef82 100644 (file)
--- a/scripts/zpool-layout/Makefile.in
+++ b/scripts/zpool-layout/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(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 \

diff --git a/zfs_config.h.in b/zfs_config.h.in
index ee2f7941e67adeb9769a524c0b4459f7fd7729d3..d244ac3832481fb18837025b20e7780241b0c31f 100644 (file)
--- a/zfs_config.h.in
+++ b/zfs_config.h.in
@@ -126,6 +126,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* mount_nodev() is available */
+#undef HAVE_MOUNT_NODEV
+
 /* open_bdev_exclusive() is available */
 #undef HAVE_OPEN_BDEV_EXCLUSIVE