Merge pull request #3831 from sjuxax/zfs-fix

Skip rootfs pinning for ZFS roots.

Merge pull request #3831 from sjuxax/zfs-fix
1910c228 · Christian Brauner · GitHub · 5b508c37 · 0dd4788a · 1910c228
Unverified Commit 1910c228 authored May 09, 2021 by Christian Brauner Committed by GitHub May 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

conf.c src/lxc/conf.c +6 -4

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -544,10 +544,12 @@ int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
 	}

 	if (rootfs->path) {
-		if (rootfs->bdev_type &&
-		    (strequal(rootfs->bdev_type, "overlay") ||
-		     strequal(rootfs->bdev_type, "overlayfs")))
-			return log_trace_errno(0, EINVAL, "Not pinning on stacking filesystem");
+		if (rootfs->bdev_type) {
+			if (strequal(rootfs->bdev_type, "overlay") || strequal(rootfs->bdev_type, "overlayfs"))
+				return log_trace_errno(0, EINVAL, "Not pinning on stacking filesystem");
+			if (strequal(rootfs->bdev_type, "zfs"))
+				return log_trace_errno(0, EINVAL, "Not pinning on ZFS filesystem");
+		}

 		dfd_path = open_at(-EBADF, rootfs->path, PROTECT_OPATH_FILE, 0, 0);
 	} else {