Merge pull request #15845 from poettering/btrfs-encrypted-fix

make path_is_encrypted() test pass on btrfs inside container
2020-05-19 17:15:22 +02:00
parent 2946d46355 3468e5ac51
commit 1d06deba0f
2 changed files with 7 additions and 1 deletions
@@ -319,7 +319,7 @@ int btrfs_get_block_device_fd(int fd, dev_t *dev) {
                        return -errno;

                if (!S_ISBLK(st.st_mode))
-                        return -ENODEV;
+                        return -ENOTBLK;

                if (major(st.st_rdev) == 0)
                        return -ENODEV;