Author: mav
Date: Tue Feb 20 04:36:51 2018
New Revision: 329625
URL: https://svnweb.freebsd.org/changeset/base/329625

Log:
  MFV r307315:
  7301 zpool export -f should be able to interrupt file freeing
  
  Reviewed by: Matthew Ahrens <mahr...@delphix.com>
  Reviewed by: Sanjay Nadkarni <sanjay.nadka...@nexenta.com>
  Reviewed by: Saso Kiselkov <saso.kisel...@nexenta.com>
  Reviewed by: John Kennedy <john.kenn...@delphix.com>
  Author: Alek Pinchuk <a...@nexenta.com>
  
  Closes #175

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c   Tue Feb 20 
04:23:43 2018        (r329624)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c   Tue Feb 20 
04:36:51 2018        (r329625)
@@ -24,7 +24,7 @@
  */
 /* Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */
 /* Copyright (c) 2013, Joyent, Inc. All rights reserved. */
-/* Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved. */
+/* Copyright 2016 Nexenta Systems, Inc. All rights reserved. */
 
 #include <sys/dmu.h>
 #include <sys/dmu_impl.h>
@@ -723,6 +723,22 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t 
        return (0);
 }
 
+/*
+ * If this objset is of type OST_ZFS return true if vfs's unmounted flag is 
set,
+ * otherwise return false.
+ * Used below in dmu_free_long_range_impl() to enable abort when unmounting
+ */
+/*ARGSUSED*/
+static boolean_t
+dmu_objset_zfs_unmounting(objset_t *os)
+{
+#ifdef _KERNEL
+       if (dmu_objset_type(os) == DMU_OST_ZFS)
+               return (zfs_get_vfs_flag_unmounted(os));
+#endif
+       return (B_FALSE);
+}
+
 static int
 dmu_free_long_range_impl(objset_t *os, dnode_t *dn, uint64_t offset,
     uint64_t length)
@@ -748,6 +764,9 @@ dmu_free_long_range_impl(objset_t *os, dnode_t *dn, ui
                uint64_t chunk_end, chunk_begin, chunk_len;
                uint64_t long_free_dirty_all_txgs = 0;
                dmu_tx_t *tx;
+
+               if (dmu_objset_zfs_unmounting(dn->dn_objset))
+                       return (SET_ERROR(EINTR));
 
                chunk_end = chunk_begin = offset + length;
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Tue Feb 
20 04:23:43 2018        (r329624)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Tue Feb 
20 04:36:51 2018        (r329625)
@@ -22,6 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
+ * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
  */
 
 #ifndef        _SYS_FS_ZFS_ZNODE_H
@@ -322,6 +323,7 @@ extern int  zfs_create_op_tables();
 extern dev_t   zfs_cmpldev(uint64_t);
 extern int     zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value);
 extern int     zfs_get_stats(objset_t *os, nvlist_t *nv);
+extern boolean_t zfs_get_vfs_flag_unmounted(objset_t *os);
 extern void    zfs_znode_dmu_fini(znode_t *);
 
 extern void zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c       Tue Feb 
20 04:23:43 2018        (r329624)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c       Tue Feb 
20 04:36:51 2018        (r329625)
@@ -428,8 +428,8 @@ zfs_rmnode(znode_t *zp)
                error = dmu_free_long_range(os, zp->z_id, 0, DMU_OBJECT_END);
                if (error) {
                        /*
-                        * Not enough space.  Leave the file in the unlinked
-                        * set.
+                        * Not enough space or we were interrupted by unmount.
+                        * Leave the file in the unlinked set.
                         */
                        zfs_znode_dmu_fini(zp);
                        zfs_znode_free(zp);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c    Tue Feb 
20 04:23:43 2018        (r329624)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c    Tue Feb 
20 04:36:51 2018        (r329625)
@@ -24,6 +24,7 @@
  * All rights reserved.
  * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
+ * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -1846,7 +1847,7 @@ zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp)
 /*
  * Teardown the zfsvfs::z_os.
  *
- * Note, if 'unmounting' if FALSE, we return with the 'z_teardown_lock'
+ * Note, if 'unmounting' is FALSE, we return with the 'z_teardown_lock'
  * and 'z_teardown_inactive_lock' held.
  */
 static int
@@ -1914,8 +1915,8 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting
         */
        if (unmounting) {
                zfsvfs->z_unmounted = B_TRUE;
-               rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
                rw_exit(&zfsvfs->z_teardown_inactive_lock);
+               rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
        }
 
        /*
@@ -2505,6 +2506,29 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_
                error = 0;
        }
        return (error);
+}
+
+/*
+ * Return true if the coresponding vfs's unmounted flag is set.
+ * Otherwise return false.
+ * If this function returns true we know VFS unmount has been initiated.
+ */
+boolean_t
+zfs_get_vfs_flag_unmounted(objset_t *os)
+{
+       zfsvfs_t *zfvp;
+       boolean_t unmounted = B_FALSE;
+
+       ASSERT(dmu_objset_type(os) == DMU_OST_ZFS);
+
+       mutex_enter(&os->os_user_ptr_lock);
+       zfvp = dmu_objset_get_user(os);
+       if (zfvp != NULL && zfvp->z_vfs != NULL &&
+           (zfvp->z_vfs->mnt_kern_flag & MNTK_UNMOUNT))
+               unmounted = B_TRUE;
+       mutex_exit(&os->os_user_ptr_lock);
+
+       return (unmounted);
 }
 
 #ifdef _KERNEL
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to