]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
idmapped-mounts: Use renameat instead of renameat2
authorYang Xu <xuyang2018.jy@fujitsu.com>
Wed, 1 Sep 2021 12:43:25 +0000 (20:43 +0800)
committerEryu Guan <guaneryu@gmail.com>
Sun, 5 Sep 2021 14:06:13 +0000 (22:06 +0800)
We don't add fallback for renameat2, so it build failed on old
kernel. So use renameat instead.

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
src/idmapped-mounts/idmapped-mounts.c

index e83f8b04a302caa761714b9f2afae527f4f6d239..4230cb48c7bf6b081376bee8db13eff258c2ac2e 100644 (file)
@@ -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");