From 94252bca893a9dd026d333682a65eea16ea11a07 Mon Sep 17 00:00:00 2001 From: Yang Xu Date: Wed, 1 Sep 2021 20:43:25 +0800 Subject: [PATCH] idmapped-mounts: Use renameat instead of renameat2 We don't add fallback for renameat2, so it build failed on old kernel. So use renameat instead. Signed-off-by: Yang Xu Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- src/idmapped-mounts/idmapped-mounts.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/idmapped-mounts/idmapped-mounts.c b/src/idmapped-mounts/idmapped-mounts.c index e83f8b04..4230cb48 100644 --- a/src/idmapped-mounts/idmapped-mounts.c +++ b/src/idmapped-mounts/idmapped-mounts.c @@ -10433,9 +10433,9 @@ static int btrfs_subvolumes_fsids_unmapped(void) } /* try to rename a subvolume */ - if (!renameat2(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, - BTRFS_SUBVOLUME1_RENAME, 0)) { - log_stderr("failure: renameat2"); + if (!renameat(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, + BTRFS_SUBVOLUME1_RENAME)) { + log_stderr("failure: renameat"); goto out; } if (errno != EOVERFLOW) { @@ -10552,9 +10552,9 @@ static int btrfs_subvolumes_fsids_unmapped_userns(void) die("failure: errno"); /* try to rename a subvolume */ - if (!renameat2(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, - BTRFS_SUBVOLUME1_RENAME, 0)) - die("failure: renameat2"); + if (!renameat(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, + BTRFS_SUBVOLUME1_RENAME)) + die("failure: renameat"); if (errno != EOVERFLOW) die("failure: errno"); @@ -10993,9 +10993,9 @@ static int btrfs_snapshots_fsids_unmapped(void) die("failure: errno"); /* try to rename a directory */ - if (!renameat2(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, - BTRFS_SUBVOLUME1_RENAME, 0)) - die("failure: renameat2"); + if (!renameat(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, + BTRFS_SUBVOLUME1_RENAME)) + die("failure: renameat"); if (errno != EOVERFLOW) die("failure: errno"); @@ -11174,9 +11174,9 @@ static int btrfs_snapshots_fsids_unmapped_userns(void) die("failure: errno"); /* try to rename a directory */ - if (!renameat2(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, - BTRFS_SUBVOLUME1_RENAME, 0)) - die("failure: renameat2"); + if (!renameat(open_tree_fd, BTRFS_SUBVOLUME1, open_tree_fd, + BTRFS_SUBVOLUME1_RENAME)) + die("failure: renameat"); if (errno != EOVERFLOW) die("failure: errno"); -- 2.39.5