From nobody Fri Mar 25 14:54:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5E1BD1A4EC32; Fri, 25 Mar 2022 14:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ4r20ll3z557c; Fri, 25 Mar 2022 14:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648220082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nT9Y8dovIJwEVMnUCmA2yi9mysm6JvaZbVUTJELa6zY=; b=iL38aBepElXcFc5W3/5Up3Acoj3qdjdB7QEeRap8oknKfSXeuhF2Pqqk0p9rIkaPep4ygI eyMhXVKg8W+ssVGHj43UFnCDo41jGS7/tjqAAaDmmIWnRw0gOvinWsBBjsdQlO9uVIgERs XYpjYW5PoaAOP8aw7pnF0vYzhZpD4z/upXO1XI4JTcO1xdbVbabkpluq5VB0i6AT2JN+vo IhO2oakHLa0LIJHiKtc0yBO7gsCTkPMExBDherAXmZTNUAM+2Pvw1po+GfrBU44GLWPQbk IIuK8xXMIGxbysuU0SQoUvVJcN+kwamIiI0U9DN0Nc5caXUDtvNJq/VhUefEyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED76066EE; Fri, 25 Mar 2022 14:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PEsfJo026109; Fri, 25 Mar 2022 14:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PEsfpX026108; Fri, 25 Mar 2022 14:54:41 GMT (envelope-from git) Date: Fri, 25 Mar 2022 14:54:41 GMT Message-Id: <202203251454.22PEsfpX026108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: ff39d74aa99a - main - linux(4): Add AT_NO_AUTOMOUNT to statx. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff39d74aa99a49749d1de26dc1f6b1e1bfebceb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648220082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nT9Y8dovIJwEVMnUCmA2yi9mysm6JvaZbVUTJELa6zY=; b=BiGb9OyGYjuSlE+GMDXFy8sX7icBsRSWfEXARaUEXGw9YTe/liXjRbWzWgGLPeUcqVu8zF utbOxNIVvHNJJXhN9lozUQudayqfczgdh0NrQIvHHwBhjCtiPWimx8zb1Yw48BhL2UPptR kFuKhTN9BKOYqghKtYPDF2J8g70ry9JMPSvMVBEH9OLzHMSiKsnMCNgOAOQaLSjCmJ+67e sdulsyy5IYHVPnF456KclGv57NtoXQF8Lza+eLI26YxoyHkSF92IxxvCCfPBZI3fDURB+T Kfetd1ax+eXLyiPJtzA8FQcb/+CAyQ2shPW5JVnk5ISBUDXR/p5cI1B51+j0Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648220082; a=rsa-sha256; cv=none; b=vYXYPH/v635cG5jvC5OLA2ghKwg43zU28axkSnho2utoqzZKTGTl7jyuhF6XLNiBILTELN yuoXneVr4h4kL2ReCqiofkN9v2RxQN4NggWhE2tW8UyqH2gUKeZSDQcDVbFbX04bbyX9Gc a3ch/6ay5hy6yFCjUDj2bgTQtWn9ldQMaQBpc3gP+S+dNXhYV5uby73t67/kzTQUBf+H83 AT0fqbiCj/W4UZ4nvMA+23gQ/npA8NvMHoYX9V3hJCqYLLGjD+vP1b4IdoE6x5KQbgP+B3 hM+lcYnJIDAbwYwFATJCKD5io2mn4NnaMjd3Snm+Hd21Ajq+dlFUeYS4DbkVOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ff39d74aa99a49749d1de26dc1f6b1e1bfebceb0 commit ff39d74aa99a49749d1de26dc1f6b1e1bfebceb0 Author: Dmitry Chagin AuthorDate: 2022-03-25 14:54:23 +0000 Commit: Dmitry Chagin CommitDate: 2022-03-25 14:54:23 +0000 linux(4): Add AT_NO_AUTOMOUNT to statx. Specific to Linux AT_NO_AUTOMOUNT flag tells the kernel to not automount the terminal component of pathname if it is a directory that is an automount point. As it is the default for FreeBSD silencly ignore this flag. glibc-2.34 uses this flag in the stat64 system calls which is used by i386. Reviewed by: trasz Differential revision: https://reviews.freebsd.org/D31524 MFC after: 2 weeks --- sys/compat/linux/linux_file.h | 7 +++++++ sys/compat/linux/linux_stats.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_file.h b/sys/compat/linux/linux_file.h index e6a5bf0ce8a6..3f885f915411 100644 --- a/sys/compat/linux/linux_file.h +++ b/sys/compat/linux/linux_file.h @@ -36,6 +36,13 @@ #define LINUX_AT_EACCESS 0x200 #define LINUX_AT_REMOVEDIR 0x200 #define LINUX_AT_SYMLINK_FOLLOW 0x400 +#define LINUX_AT_NO_AUTOMOUNT 0x800 + /* + * Specific to Linux AT_NO_AUTOMOUNT flag tells the kernel to + * not automount the terminal component of pathname if it is a + * directory that is an automount point. As FreeBSD does not + * have such facility (automount), we can simply ignore this flag. + */ #define LINUX_AT_EMPTY_PATH 0x1000 /* diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 9dc7686cb963..e01cb0c8d87a 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -774,7 +774,8 @@ linux_statx(struct thread *td, struct linux_statx_args *args) int error, dirfd, flags, unsupported; struct stat buf; - unsupported = args->flags & ~(LINUX_AT_SYMLINK_NOFOLLOW | LINUX_AT_EMPTY_PATH); + unsupported = args->flags & ~(LINUX_AT_SYMLINK_NOFOLLOW | + LINUX_AT_EMPTY_PATH | LINUX_AT_NO_AUTOMOUNT); if (unsupported != 0) { linux_msg(td, "statx unsupported flags 0x%x", unsupported); return (EINVAL);