diff options
| author | George Melikov <[email protected]> | 2017-01-27 22:46:39 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-27 11:46:39 -0800 |
| commit | a08abc1bb3e354d8c352c91d22cc733a84fafb50 (patch) | |
| tree | 5ae2e2dff6f9ee2c2927aabf03a064bb8e6e4fd2 /module/zfs/zfs_dir.c | |
| parent | cc9bb3e58e926d4e056a89046301c1349755957b (diff) | |
OpenZFS 7301 - zpool export -f should be able to interrupt file freeing
Authored by: Alek Pinchuk <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Sanjay Nadkarni <[email protected]>
Reviewed by: Saso Kiselkov <[email protected]>
Reviewed by: John Kennedy <[email protected]>
Approved by: Gordon Ross <[email protected]>
Reviewed-by: Tim Chase <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7301
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/eb72182
Closes #5680
Diffstat (limited to 'module/zfs/zfs_dir.c')
| -rw-r--r-- | module/zfs/zfs_dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c index b66a9b364..22e64d393 100644 --- a/module/zfs/zfs_dir.c +++ b/module/zfs/zfs_dir.c @@ -644,8 +644,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); return; |