From nobody Mon Feb 6 19:07:40 2023 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 4P9bP82lPcz3n43f; Mon, 6 Feb 2023 19:07:40 +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 4P9bP82Krjz3Pbd; Mon, 6 Feb 2023 19:07:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710460; 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=+OuUuvYwOpk2NQaLAh17qxSTWnkfi5X1bswRWGD17/o=; b=QAR9kPihs8A3FqwgzojHFY1mlM3HnZ/Gmd92oeywMuym87zTs0IYqm5+W9YTvmJ8Emt/hf JXLTt7B1YGTEFqqEYnT3wPnOXewg0tCPUBFIcQMRjPCBo1ezA3lF5hcGmFiO9bVsftisEQ yo8lGIOz8/2Rpu0GZ6odY9TeD7COJRgUtGZaHcBFEfo8bsIMOIPILnDHW+Ta+/cdSCnEML mx9Kmbdvx71Ad0BFfnupo3mPjk+oFplz3OKH723dfSI37I8pKmNj7fxY+bSzvfsAe+1aLO M6e3iRzU8DKLImJr7DJTfwuF/efJ71zom5s4yEhm14Be7LsN65vuh8ZfeTu3uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710460; 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=+OuUuvYwOpk2NQaLAh17qxSTWnkfi5X1bswRWGD17/o=; b=jBMavFDUdOoveH8E/l25q+qqlMJVWRXrV3/ld5gIWGO/Xhele7xlrJXY2ETAP/0UyggkVw Rxoz2c0SLEnoCSr1oswgogmjwKVi5mIkdlpXhehso8ycYRIH6rOa0E8qqXITqTo39z0LyM FmAKmXU8tMlJ9mMmgxtfO27IJgSI1he2kQO2K/nwcW8EYemQTzArG6GP3yFAUzX5UqXsSe E5ZlJtaq3Piz/ynMa5R7M15qkR7YOQjrjFakHUsW6uMDoHYR37jElwwatATZ2SGjx9/LMS Ov0ZiQWQx2VqmJ1dLXKC8+5GJtzESFBUhjluOCrq8N6xs/apq2jByYY1puUijw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675710460; a=rsa-sha256; cv=none; b=kCDg1irSgizF+s67m8RLLiCB7iU6v+m6AlI844e7AMIi7Qk8CatVlxx6FeVshR0zJuyetH vmyL/nGC+quQKrRvXKkewYUd2cPB6ucBJUyZXJedcqbe/LuuyOIjLwOn3BbhaScopKLpRu aJs4pvCHlxodfq5LOBY71ficAN694y5TY2xYcUOs8WUROWdA0blz55SU/dO2d6gTOlnOWX 0DKrJssSjd0gIo2yqMN48qQVbxHQCydSJ3S4L06vVybE934K2tQkqvw5JZGq1/Yv6BRKLD nxKluutzy84xcxUPWksTEmk3KC/89TjFzQQl/SkeRBsqp+LNV1v3voOP0Aufyw== 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 4P9bP81NPmzmJL; Mon, 6 Feb 2023 19:07:40 +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 316J7eH3076783; Mon, 6 Feb 2023 19:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316J7eFj076782; Mon, 6 Feb 2023 19:07:40 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:07:40 GMT Message-Id: <202302061907.316J7eFj076782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: ef4f2cca6085 - stable/13 - linux(4): Convert mount exported flags for statfs system calls. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ef4f2cca6085e79f4610897dbc62c489f1976a9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ef4f2cca6085e79f4610897dbc62c489f1976a9c commit ef4f2cca6085e79f4610897dbc62c489f1976a9c Author: Dmitry Chagin AuthorDate: 2023-01-28 10:20:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-06 19:06:29 +0000 linux(4): Convert mount exported flags for statfs system calls. MFC after: 1 week (cherry picked from commit 9922bccbc9c4effb02b99391088d0405f9c0f75e) --- sys/compat/linux/linux.h | 15 +++++++++++++++ sys/compat/linux/linux_stats.c | 25 +++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 6400de4cb228..40e563014fde 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -264,6 +264,21 @@ struct l_statx { uint64_t __spare2[13]; }; +/* + * statfs f_flags + */ +#define LINUX_ST_RDONLY 0x0001 +#define LINUX_ST_NOSUID 0x0002 +#define LINUX_ST_NODEV 0x0004 /* No native analogue */ +#define LINUX_ST_NOEXEC 0x0008 +#define LINUX_ST_SYNCHRONOUS 0x0010 +#define LINUX_ST_VALID 0x0020 +#define LINUX_ST_MANDLOCK 0x0040 /* No native analogue */ +#define LINUX_ST_NOATIME 0x0400 +#define LINUX_ST_NODIRATIME 0x0800 /* No native analogue */ +#define LINUX_ST_RELATIME 0x1000 /* No native analogue */ +#define LINUX_ST_NOSYMFOLLOW 0x2000 + #define lower_32_bits(n) ((uint32_t)((n) & 0xffffffff)) #ifdef KTRACE diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 63a5c37e1acf..a1cc2bb7bf8b 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -410,6 +410,27 @@ bsd_to_linux_ftype(const char *fstypename) return (0L); } +static int +bsd_to_linux_mnt_flags(int f_flags) +{ + int flags = LINUX_ST_VALID; + + if (f_flags & MNT_RDONLY) + flags |= LINUX_ST_RDONLY; + if (f_flags & MNT_NOEXEC) + flags |= LINUX_ST_NOEXEC; + if (f_flags & MNT_NOSUID) + flags |= LINUX_ST_NOSUID; + if (f_flags & MNT_NOATIME) + flags |= LINUX_ST_NOATIME; + if (f_flags & MNT_NOSYMFOLLOW) + flags |= LINUX_ST_NOSYMFOLLOW; + if (f_flags & MNT_SYNCHRONOUS) + flags |= LINUX_ST_SYNCHRONOUS; + + return (flags); +} + static int bsd_to_linux_statfs(struct statfs *bsd_statfs, struct l_statfs *linux_statfs) { @@ -433,7 +454,7 @@ bsd_to_linux_statfs(struct statfs *bsd_statfs, struct l_statfs *linux_statfs) linux_statfs->f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; linux_statfs->f_namelen = MAXNAMLEN; linux_statfs->f_frsize = bsd_statfs->f_bsize; - linux_statfs->f_flags = 0; + linux_statfs->f_flags = bsd_to_linux_mnt_flags(bsd_statfs->f_flags); memset(linux_statfs->f_spare, 0, sizeof(linux_statfs->f_spare)); return (0); @@ -480,7 +501,7 @@ bsd_to_linux_statfs64(struct statfs *bsd_statfs, struct l_statfs64 *linux_statfs linux_statfs->f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; linux_statfs->f_namelen = MAXNAMLEN; linux_statfs->f_frsize = bsd_statfs->f_bsize; - linux_statfs->f_flags = 0; + linux_statfs->f_flags = bsd_to_linux_mnt_flags(bsd_statfs->f_flags); memset(linux_statfs->f_spare, 0, sizeof(linux_statfs->f_spare)); }