diff options
| author | Brian Behlendorf <[email protected]> | 2012-12-05 13:00:49 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-12-05 13:41:30 -0800 |
| commit | 53c7411919a64d6f0889aa0d6974610f6cd35744 (patch) | |
| tree | a95b0ea989fbf6a0c6c6935ac55cc96b05049c76 /module/zfs/zfs_vfsops.c | |
| parent | d3aa3ea96e02547166563bbd60bc8581567a140a (diff) | |
Revert "Fix unlink/xattr deadlock"
This reverts commit b00131d43ca344d4b205a03ab3eb771a060e5087 which
is no longer needed due to e89260a1c8851ce05ea04b23606ba438b271d890.
This change forces all xattr znodes to hold a reference on their
parent which ensures prune_icache() will never attempt to evict
both the parent and child concurrently. This effectively prevents
the deadlock condition from ever occuring.
Therefore we can safely revert back to the upstream synchronous
cleanup code. This is nice because it keeps our code base closer
to upstream and resolves the performance issues introduced by the
original deadlock fix.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #457
Diffstat (limited to 'module/zfs/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 90f9055af..175dca821 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -1041,12 +1041,6 @@ 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. - */ - taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os))); - - /* * Close the zil. NB: Can't close the zil while zfs_inactive * threads are blocked as zil_close can call zfs_inactive. */ |