summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRodrigo Campos <rodrigo@sdfg.com.ar>2023-03-14 12:45:08 +0100
committerZorro Lang <zlang@kernel.org>2023-03-14 22:52:48 +0800
commitdd7d351114324d91f4ff29c769a89da5936bf0db (patch)
treec8c4f7f5deab52723dbb1be25361a3e54f530bee /src
parent60de82ed2d23cd4ec81f7e406b036fbca5db4710 (diff)
vfs: Prepare tests in &s_idmapped_mounts to be reused inside a userns
Future patches will call these tests within a userns. So, let's change the makedev major/minor to something that works inside a userns. Signed-off-by: Rodrigo Campos <rodrigo@sdfg.com.ar> Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Zorro Lang <zlang@kernel.org>
Diffstat (limited to 'src')
-rw-r--r--src/vfs/idmapped-mounts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vfs/idmapped-mounts.c b/src/vfs/idmapped-mounts.c
index ed7948b6..eb0df938 100644
--- a/src/vfs/idmapped-mounts.c
+++ b/src/vfs/idmapped-mounts.c
@@ -535,7 +535,7 @@ static int fsids_mapped(const struct vfstest_info *info)
die("failure: create");
/* create character device */
- if (mknodat(open_tree_fd, CHRDEV1, S_IFCHR | 0644, makedev(5, 1)))
+ if (mknodat(open_tree_fd, CHRDEV1, S_IFCHR | 0644, makedev(0, 0)))
die("failure: create");
/* create symlink */
@@ -764,7 +764,7 @@ static int expected_uid_gid_idmapped_mounts(const struct vfstest_info *info)
}
/* create character device */
- if (mknodat(info->t_dir1_fd, CHRDEV1, S_IFCHR | 0644, makedev(5, 1))) {
+ if (mknodat(info->t_dir1_fd, CHRDEV1, S_IFCHR | 0644, makedev(0, 0))) {
log_stderr("failure: mknodat");
goto out;
}