c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 10:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

libzfs: Add error message for why creating mountpoint failed

Browse Source 
When zfs_mount_at() fails to stat the mountpoint and can't create the
directory, we return an error with a message "failed to create
mountpoint" but there is no indication why it failed.

Add the error string from the syscall to the error aux message.

Update do_mount for Linux to return the errno instead of -1.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10550
This commit is contained in:
Ryan Moeller 2020-07-11 20:16:13 -04:00 committed by GitHub
parent 3933305eac
commit 217f48373f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libzfs/libzfs_mount.c
View File

@ -466,7 +466,8 @@ zfs_mount_at(zfs_handle_t *zhp, const char *options, int flags,
if (lstat(mountpoint, &buf) != 0) { if (lstat(mountpoint, &buf) != 0) {
if (mkdirp(mountpoint, 0755) != 0) { if (mkdirp(mountpoint, 0755) != 0) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"failed to create mountpoint")); "failed to create mountpoint: %s"),
strerror(errno));
return (zfs_error_fmt(hdl, EZFS_MOUNTFAILED, return (zfs_error_fmt(hdl, EZFS_MOUNTFAILED,
dgettext(TEXT_DOMAIN, "cannot mount '%s'"), dgettext(TEXT_DOMAIN, "cannot mount '%s'"),
mountpoint)); mountpoint));

4
lib/libzfs/os/linux/libzfs_mount_os.c
View File

@ -569,7 +569,9 @@ do_mount(zfs_handle_t *zhp, const char *mntpt, char *opts, int flags)
} }
strlcat(myopts, opts, MNT_LINE_MAX); strlcat(myopts, opts, MNT_LINE_MAX);
zfs_adjust_mount_options(zhp, mntpt, myopts, NULL); zfs_adjust_mount_options(zhp, mntpt, myopts, NULL);
error = mount(src, mntpt, MNTTYPE_ZFS, mntflags, myopts); if (mount(src, mntpt, MNTTYPE_ZFS, mntflags, myopts)) {
return (errno);
}
} else { } else {
char *argv[9] = { char *argv[9] = {
"/bin/mount", "/bin/mount",