From nobody Thu Jun 29 08:20:21 2023 X-Original-To: dev-commits-src-branches@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 4QsBGF4Fycz4kng9; Thu, 29 Jun 2023 08:20:21 +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 4QsBGF2hfPz3tjp; Thu, 29 Jun 2023 08:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026821; 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=CaCA1Qb6LlqvwNCspI/sGzvtQx2+uLaDwgvSTL9GPM0=; b=e7qCwcKwJtdaD7HjPXzRjiMiw/TUksvN7b4JmTUheS6l/IwS9ytuRiDYROGrTkFJz5LRKG fuOPR0Sn7QO21gPRImhUf6MS9zIxAfbPiiNNl2NnADeWi8iPoweAl4ovxxfo3MWqp/YeJS b3gK/BI5m/YKBLl8d/h64Bx95/Aq8UwAMPINezcGZzc9fyELyRoa6kOKerjHw2xgmUdCJY 7Kx0GEvK5hWnmqkSnxHQHZPQRL73Skw86DqiwqM/VDO+39qz20NHCxu4JXZm+3Q8jONgMp JBdTdr8j94Ry/Ur6y0hfSnXaFlaaOCSFeRXWqLU8LUXhpxj4C457NmoiHjrD7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026821; 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=CaCA1Qb6LlqvwNCspI/sGzvtQx2+uLaDwgvSTL9GPM0=; b=T3MS5qsOEGaOtT6KvYha7yb5xL7JCgXPxHIBHo6ew4uKo0fmJKLEzwCfC5VvXcoRdfK54F H5kmjuZwM0Z5BZdejU3zbMQIUQpITCbHTgix2aTuWkUfoNxjrISCHJvfw4W3f0hD5Ba1K1 jooo8bpBNvS+d6GbwH8tSMZbg4/41nAxzFNQufc6wC6DTKgeqJb1EkAqiXtLsmTQvM59HB vtAf7U206VpTHfJwYqdDBg7FgQoMtrDIpKVXrn16rQYJSva1sZ98XHhxRx0W7BEP7Tzf8k sMdI466iCcJJ9kFzUPyuPRHBF7L1ZlZmt8z2Y4/NTqel8L/8v2SbwMC4Hzl8+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026821; a=rsa-sha256; cv=none; b=R1xuBiC7vqN2iq8QrMtXQNobP3lvTNbZLUf/cpbBYBzQfb3IQBANwwg+F6r6JZtzftkWkk CMNWRqrEw+HAkhrVjotTYKZLYxfaTNIDS9Em6XjrBLWO26JLK1dTlg+1YpWe7TxtLt3iJ0 qZOFlM5faznzS+2g5FqrWDs/X6pbyGzhA7R+ODj3ntT3en1TBJcMrcKEBOurGHvYJDJYJd M2NBbTeOzWWJ7WHMgyc8mUlQXTlR7o2ncQ3vcW/C1K1dCpA7cVBO+okANLYJGd30qr1aMg GDYrrT6WhruhGhpGF/Py7fQ9ASxnCeDX9VPP/HXW+OB9ePDIlrbo9YnmEHcMGw== 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 4QsBGF11kNz182x; Thu, 29 Jun 2023 08:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KLXE083354; Thu, 29 Jun 2023 08:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KLmk083353; Thu, 29 Jun 2023 08:20:21 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:21 GMT Message-Id: <202306290820.35T8KLmk083353@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: 38e5a2a185bc - stable/13 - linux(4): Make struct newstat to match actual Linux one List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 38e5a2a185bc87d6775b96f07055263ca3377bcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=38e5a2a185bc87d6775b96f07055263ca3377bcd commit 38e5a2a185bc87d6775b96f07055263ca3377bcd Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:01 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:36 +0000 linux(4): Make struct newstat to match actual Linux one In the struct stat the st_dev, st_rdev are unsigned long. (cherry picked from commit e0bfe0d62ca708c8c6173296cc05f6bbfb79b2ee) --- sys/amd64/linux/linux.h | 6 +++--- sys/amd64/linux32/linux.h | 6 ++---- sys/arm64/linux/linux.h | 4 ++-- sys/i386/linux/linux.h | 6 ++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 0cf7d02c5833..81d9f48f6271 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -134,14 +134,14 @@ struct l_timespec { }; struct l_newstat { - l_dev_t st_dev; + l_ulong st_dev; l_ino_t st_ino; l_ulong st_nlink; l_uint st_mode; l_uid_t st_uid; l_gid_t st_gid; - l_uint __st_pad1; - l_dev_t st_rdev; + l_uint __st_pad0; + l_ulong st_rdev; l_off_t st_size; l_long st_blksize; l_long st_blocks; diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 4552c60e260b..02fcd320152d 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -180,15 +180,13 @@ struct l_timespec64 { }; struct l_newstat { - l_ushort st_dev; - l_ushort __pad1; + l_ulong st_dev; l_ulong st_ino; l_ushort st_mode; l_ushort st_nlink; l_ushort st_uid; l_ushort st_gid; - l_ushort st_rdev; - l_ushort __pad2; + l_ulong st_rdev; l_ulong st_size; l_ulong st_blksize; l_ulong st_blocks; diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index bee97691b744..a20b3c90a066 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -128,7 +128,7 @@ struct l_timespec { #define LINUX_O_LARGEFILE 000400000 struct l_newstat { - l_dev_t st_dev; + l_ulong st_dev; l_ino_t st_ino; l_uint st_mode; l_uint st_nlink; @@ -136,7 +136,7 @@ struct l_newstat { l_uid_t st_uid; l_gid_t st_gid; - l_dev_t st_rdev; + l_ulong st_rdev; l_ulong __st_pad1; l_off_t st_size; l_int st_blksize; diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 7e10ff357e00..2ccb2f92ef22 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -153,15 +153,13 @@ struct l_timespec64 { }; struct l_newstat { - l_ushort st_dev; - l_ushort __pad1; + l_ulong st_dev; l_ulong st_ino; l_ushort st_mode; l_ushort st_nlink; l_ushort st_uid; l_ushort st_gid; - l_ushort st_rdev; - l_ushort __pad2; + l_ulong st_rdev; l_ulong st_size; l_ulong st_blksize; l_ulong st_blocks;