From: Yang Xu <xuyang2018.jy@fujitsu.com>
To: <fstests@vger.kernel.org>
Cc: Yang Xu <xuyang2018.jy@fujitsu.com>
Subject: [PATCH 2/2] idmapped-mounts.c: Use renameat instead of renameat2
Date: Sun, 25 Apr 2021 18:02:39 +0800 [thread overview]
Message-ID: <1619344959-3672-2-git-send-email-xuyang2018.jy@fujitsu.com> (raw)
In-Reply-To: <1619344959-3672-1-git-send-email-xuyang2018.jy@fujitsu.com>
We don't add fallback for renameat2, so it build failed on old kernel.
Also, renameat2() man-pages said as below:
"renameat2() has an additional flags argument. A renameat2() call with
a zero flags argument is equivalent to renameat()."
In this src file, we use zero flag for all renameat2 call. So we use
renameat directly.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
src/idmapped-mounts/idmapped-mounts.c | 222 +++++++++++++-------------
1 file changed, 111 insertions(+), 111 deletions(-)
diff --git a/src/idmapped-mounts/idmapped-mounts.c b/src/idmapped-mounts/idmapped-mounts.c
index 870a8fe7..1a02953d 100644
--- a/src/idmapped-mounts/idmapped-mounts.c
+++ b/src/idmapped-mounts/idmapped-mounts.c
@@ -874,8 +874,8 @@ static int fsids_unmapped(void)
}
/* try to rename a file */
- if (!renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0)) {
- log_stderr("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME)) {
+ log_stderr("failure: renameat");
goto out;
}
if (errno != EOVERFLOW) {
@@ -884,8 +884,8 @@ static int fsids_unmapped(void)
}
/* try to rename a directory */
- if (!renameat2(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME, 0)) {
- log_stderr("failure: renameat2");
+ if (!renameat(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME)) {
+ log_stderr("failure: renameat");
goto out;
}
if (errno != EOVERFLOW) {
@@ -1048,11 +1048,11 @@ static int fsids_mapped(void)
die("failure: create hardlink");
/* try to rename a file */
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
die("failure: rename");
/* try to rename a directory */
- if (renameat2(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME, 0))
+ if (renameat(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME))
die("failure: rename");
/* remove file */
@@ -1183,14 +1183,14 @@ static int create_in_userns(void)
die("failure: check ownership");
/* try to rename a file */
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
die("failure: create");
if (!expected_uid_gid(open_tree_fd, FILE1_RENAME, 0, 0, 0))
die("failure: check ownership");
/* try to rename a file */
- if (renameat2(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME, 0))
+ if (renameat(open_tree_fd, DIR1, open_tree_fd, DIR1_RENAME))
die("failure: create");
if (!expected_uid_gid(open_tree_fd, DIR1_RENAME, 0, 0, 0))
@@ -1558,8 +1558,8 @@ static int rename_crossing_mounts(void)
* interested in making sure we're not introducing an accidental way to
* violate that restriction or that suddenly this becomes possible.
*/
- if (!renameat2(open_tree_fd, FILE1, t_dir1_fd, FILE1_RENAME, 0)) {
- log_stderr("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE1, t_dir1_fd, FILE1_RENAME)) {
+ log_stderr("failure: renameat");
goto out;
}
if (errno != EXDEV) {
@@ -1654,8 +1654,8 @@ static int rename_crossing_idmapped_mounts(void)
* interested in making sure we're not introducing an accidental way to
* violate that restriction or that suddenly this becomes possible.
*/
- if (!renameat2(open_tree_fd1, FILE1, open_tree_fd2, FILE1_RENAME, 0)) {
- log_stderr("failure: renameat2");
+ if (!renameat(open_tree_fd1, FILE1, open_tree_fd2, FILE1_RENAME)) {
+ log_stderr("failure: renameat");
goto out;
}
if (errno != EXDEV) {
@@ -1726,8 +1726,8 @@ static int rename_from_idmapped_mount(void)
}
/* We're not crossing a mountpoint so this must succeed. */
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0)) {
- log_stderr("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME)) {
+ log_stderr("failure: renameat");
goto out;
}
@@ -1794,7 +1794,7 @@ static int rename_from_idmapped_mount_in_userns(void)
die("failure: check ownership");
/* We're not crossing a mountpoint so this must succeed. */
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
die("failure: create");
if (!expected_uid_gid(open_tree_fd, FILE1_RENAME, 0, 0, 0))
@@ -5157,17 +5157,17 @@ static int sticky_bit_rename(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE1_RENAME, dir_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1_RENAME, dir_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2_RENAME, dir_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2_RENAME, dir_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5200,13 +5200,13 @@ static int sticky_bit_rename(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (!renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
@@ -5239,17 +5239,17 @@ static int sticky_bit_rename(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE1_RENAME, dir_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1_RENAME, dir_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2_RENAME, dir_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2_RENAME, dir_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5286,17 +5286,17 @@ static int sticky_bit_rename(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE1_RENAME, dir_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1_RENAME, dir_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2_RENAME, dir_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2_RENAME, dir_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5410,17 +5410,17 @@ static int sticky_bit_rename_idmapped_mounts(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5453,13 +5453,13 @@ static int sticky_bit_rename_idmapped_mounts(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (!renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
@@ -5492,17 +5492,17 @@ static int sticky_bit_rename_idmapped_mounts(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5538,17 +5538,17 @@ static int sticky_bit_rename_idmapped_mounts(void)
if (!switch_ids(1000, 1000))
die("failure: switch_ids");
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5670,17 +5670,17 @@ static int sticky_bit_rename_idmapped_mounts_in_userns(void)
if (!switch_userns(attr.userns_fd, 1000, 1000, true))
die("failure: switch_userns");
- if (renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE1_RENAME, dir_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE1_RENAME, dir_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(dir_fd, FILE2_RENAME, dir_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(dir_fd, FILE2_RENAME, dir_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5718,23 +5718,23 @@ static int sticky_bit_rename_idmapped_mounts_in_userns(void)
if (!switch_userns(attr.userns_fd, 1000, 1000, true))
die("failure: switch_userns");
- if (!renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
@@ -5772,27 +5772,27 @@ static int sticky_bit_rename_idmapped_mounts_in_userns(void)
if (!switch_userns(attr.userns_fd, 1000, 1000, true))
die("failure: switch_userns");
- if (!renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
@@ -5834,28 +5834,28 @@ static int sticky_bit_rename_idmapped_mounts_in_userns(void)
die("failure: switch_userns");
/* we don't own the directory from the original mount */
- if (!renameat2(dir_fd, FILE1, dir_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE1, dir_fd, FILE1_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
- if (!renameat2(dir_fd, FILE2, dir_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (!renameat(dir_fd, FILE2, dir_fd, FILE2_RENAME))
+ die("failure: renameat");
if (errno != EPERM)
die("failure: errno");
/* we own the file from the idmapped mount */
- if (renameat2(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1, open_tree_fd, FILE1_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2, open_tree_fd, FILE2_RENAME))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE1_RENAME, open_tree_fd, FILE1))
+ die("failure: renameat");
- if (renameat2(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2, 0))
- die("failure: renameat2");
+ if (renameat(open_tree_fd, FILE2_RENAME, open_tree_fd, FILE2))
+ die("failure: renameat");
exit(EXIT_SUCCESS);
}
--
2.23.0
prev parent reply other threads:[~2021-04-25 9:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-25 10:02 [PATCH 1/2] src/*: Fix an error for the loop initialization declaration Yang Xu
2021-04-25 10:02 ` Yang Xu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1619344959-3672-2-git-send-email-xuyang2018.jy@fujitsu.com \
--to=xuyang2018.jy@fujitsu.com \
--cc=fstests@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.