Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Stop segfaulting on unmount error case 

After interrupting ZTS runs that errored out, I found that
"zpool export testpool2" was segfaulting.

This seems unnecessary.

Reviewed-by: szubersk <szuberskidamian@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12804
This commit is contained in:
Rich Ercolani 2021-11-30 13:36:36 -05:00 committed by GitHub
parent 547df81641
commit 5dc6fc2b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzfs/libzfs_mount.c
View File

@ -595,9 +595,13 @@ unmount_one(zfs_handle_t *zhp, const char *mountpoint, int flags)
default: default:
libzfs_err = EZFS_UMOUNTFAILED; libzfs_err = EZFS_UMOUNTFAILED;
} }
if (zhp) {
return (zfs_error_fmt(zhp->zfs_hdl, libzfs_err, return (zfs_error_fmt(zhp->zfs_hdl, libzfs_err,
dgettext(TEXT_DOMAIN, "cannot unmount '%s'"), dgettext(TEXT_DOMAIN, "cannot unmount '%s'"),
mountpoint)); mountpoint));
} else {
return (-1);
}
} }
return (0); return (0);