ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: do not canonicalize ZFS source dataset 

Fixes: https://github.com/karelzak/util-linux/issues/1231
Addresses: https://github.com/systemd/systemd/issues/18188
Addresses: https://github.com/openzfs/zfs/pull/11295
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-01-14 12:45:28 +01:00
parent 0735d0efe1
commit 372ce5b74e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmount/src/context.c
View File

@ -1764,7 +1764,7 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt)
{
const char *path = NULL;
struct libmnt_cache *cache;
const char *t, *v, *src;
const char *t, *v, *src, *type;
int rc = 0;
struct libmnt_ns *ns_old;
@ -1786,6 +1786,11 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt)
if (!src || mnt_fs_is_netfs(cxt->fs))
return 0;
/* ZFS source is always "dataset", not a real path */
type = mnt_fs_get_fstype(cxt->fs);
if (type && strcmp(type, "zfs") == 0)
return 0;
DBG(CXT, ul_debugobj(cxt, "srcpath '%s'", src));
ns_old = mnt_context_switch_target_ns(cxt);