Skip to content

Commit

Permalink
Wait for all znodes to be released before tearing down the superblock
Browse files Browse the repository at this point in the history
By the time we're tearing down our superblock the VFS has started releasing
all our inodes/znodes. Some of this work may have been handed off to our
iput taskq so we need to wait for that work to complete. However the iput
from the taskq can itself result in additional work being added to the
taskq:

dsl_pool_iput_taskq
 iput
  iput_final
   evict
    destroy_inode
     zpl_inode_destroy
      zfs_inode_destroy
       zfs_iput_async(ZTOI(zp->z_xattr_parent))
        taskq_dispatch(dsl_pool_iput_taskq..., iput, ...)

Let's wait until all our znodes have been released.

Signed-off-by: Chris Dunlop <chris@onthe.net.au>
Closes #3281
  • Loading branch information
chrisrd committed Apr 15, 2015
1 parent b467db4 commit 1d885c9
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions module/zfs/zfs_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1137,8 +1137,15 @@ zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting)
* drain the iput_taskq to ensure all active references to the
* zfs_sb_t have been handled only then can it be safely destroyed.
*/
if (zsb->z_os)
taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
if (zsb->z_os) {
mutex_enter(&zsb->z_znodes_lock);
while (zsb->z_nr_znodes) {
mutex_exit(&zsb->z_znodes_lock);
schedule();
taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
}
mutex_exit(&zsb->z_znodes_lock);
}

rrw_enter(&zsb->z_teardown_lock, RW_WRITER, FTAG);

Expand Down Expand Up @@ -1175,21 +1182,6 @@ zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting)
return (SET_ERROR(EIO));
}

/*
* At this point there are no VFS ops active, and any new VFS ops
* will fail with EIO since we have z_teardown_lock for writer (only
* relevant for forced unmount).
*
* Release all holds on dbufs.
*/
mutex_enter(&zsb->z_znodes_lock);
for (zp = list_head(&zsb->z_all_znodes); zp != NULL;
zp = list_next(&zsb->z_all_znodes, zp)) {
if (zp->z_sa_hdl)
zfs_znode_dmu_fini(zp);
}
mutex_exit(&zsb->z_znodes_lock);

/*
* If we are unmounting, set the unmounted flag and let new VFS ops
* unblock. zfs_inactive will have the unmounted behavior, and all
Expand Down

0 comments on commit 1d885c9

Please sign in to comment.