git: 8505eb5dd8f7 - main - linux(4): Convert flags before use in utimensat.

Dmitry Chagin dchagin at FreeBSD.org
Mon May 31 19:31:09 UTC 2021


The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=8505eb5dd8f743f29e9c93b6814a34f1890e6c41

commit 8505eb5dd8f743f29e9c93b6814a34f1890e6c41
Author:     Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-05-31 19:30:37 +0000
Commit:     Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-05-31 19:30:37 +0000

    linux(4): Convert flags before use in utimensat.
    
    Differential Revision:  https://reviews.freebsd.org/D30487
    MFC after:              2 weeks
---
 sys/compat/linux/linux_misc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index fc846df6689f..2be328a0d6d2 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -861,6 +861,9 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args)
 			return (0);
 	}
 
+	if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW)
+		flags |= AT_SYMLINK_NOFOLLOW;
+
 	if (!LUSECONVPATH(td)) {
 		if (args->pathname != NULL) {
 			return (kern_utimensat(td, dfd, args->pathname,
@@ -873,9 +876,6 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args)
 	else if (args->flags != 0)
 		return (EINVAL);
 
-	if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW)
-		flags |= AT_SYMLINK_NOFOLLOW;
-
 	if (path == NULL)
 		error = kern_futimens(td, dfd, timesp, UIO_SYSSPACE);
 	else {


More information about the dev-commits-src-all mailing list