From nobody Thu Jun 29 08:20:25 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 4QsBGK6GQqz4knXK; Thu, 29 Jun 2023 08:20:25 +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 4QsBGK5JMxz3v95; Thu, 29 Jun 2023 08:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026825; 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=iIshxLIEhLZrRgZvjwZTfV8/Fni8+/FcBzJb1uPxcXE=; b=RXeeUt5Tdh5p+YayMTPRpcvLEHIc8v5GBVu6eu1XEcaN2KOnLqhHNOxT3I60lngsrU5+q5 AAExfx0RKt1ZiAjoHGlWyzLeP4H0rbWNcAHn+QNXPktSbqEtfOycYnrxuma9pEn6AOvqvH VyfPb8p/nMyIL7keRi7ptYvq92tFDZ1915ijuTy2dK215VTlM9HYTX5BROdRmn/C9ZjKNK L0J+eMAN/Z25AkTXXnXnO6SsM5mapUckM3qPyLuV5mdfHeKYT0xeB3DrAe+s2k/iw1RZC2 54ko25ed8mbeWP43GZSm7/lx95Fff+awoYsn1IwGPRAT4zF+58pFHY4VweOsaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026825; 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=iIshxLIEhLZrRgZvjwZTfV8/Fni8+/FcBzJb1uPxcXE=; b=xWCoPkY8bZvxFeywrvMgSXp1zsJjcPLqIw5bE8bgzuVXMBHYN2EJsN6IqJkPfxExY7Ji5S 8SQbLlKg2cFJLcScMsNIzGl/BZRDAVpEF3jEU5uBwobnpMXfdhT5Dytyn/xOJlXCU4Zq0d zE0HPsCiYexhK2RCTaiXCAawBiZ94HsOAHl53JxJG7l9RcIpj5FjpzDX/iKwMarpawDa3u mDvLt6H5SgcZLXB8BoraAytaZ8L7qaJmdZf9VTWToQ5OpumBiU3LhkStZ5VoFNhprXN2M+ ZFAd060ZZqgQx8Nen0rts9X4GUIsqsuas/E8Chz5zkhxsOm6sTVnOwBmemY/MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026825; a=rsa-sha256; cv=none; b=c8y8Lmn1x5DN8eCHn/tzVZ0IvEPRGiSL29qhhE5ZVpY3oh2a2NYboJ+2qUUS9nDVL+9JOw 5QGky8e3yQ+fQbn/D1UpHdmj1YmvP7iGHZLi/4+FZ6wxPWRB4MlRIiDzXit7OD5P91e7Aw IafYd8piQNz/mFlmJU1aCUPvNbErOrD9rAb83fRGydFdte1s6zqD7DmYYoYpzbbQLc1Vf/ mwEDNExwQe38n1rjR0/ek+36DLAD0VgbVT8yHP1QLPyt+zD0EpypLJbPIMqxV2OGISy4BE zeoaAMhoOIJv0nyCq3hVoFcQ0CcEa1bDfAxmC1el95d8ILkyslMw+6uF7Mdwqw== 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 4QsBGK4PFhz17q2; Thu, 29 Jun 2023 08:20:25 +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 35T8KPFW083436; Thu, 29 Jun 2023 08:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KPSW083435; Thu, 29 Jun 2023 08:20:25 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:25 GMT Message-Id: <202306290820.35T8KPSW083435@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: 86fde4e64528 - stable/13 - linux(4): Make struct stat64 to match Linux actual 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: 86fde4e64528d9e5979623f61207c690631ff1ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=86fde4e64528d9e5979623f61207c690631ff1ee commit 86fde4e64528d9e5979623f61207c690631ff1ee Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:04 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:43 +0000 linux(4): Make struct stat64 to match Linux actual one (cherry picked from commit 80d8a4a0030849229cb9ebd434682ef927bc9963) --- sys/amd64/linux32/linux.h | 11 +++++------ sys/i386/linux/linux.h | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 9ad288e339df..32f2f42b0108 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -216,19 +216,18 @@ struct l_old_stat { }; struct l_stat64 { - l_ushort st_dev; - u_char __pad0[10]; + l_ulonglong st_dev; + u_char __pad0[4]; l_ulong __st_ino; l_uint st_mode; l_uint st_nlink; l_ulong st_uid; l_ulong st_gid; - l_ushort st_rdev; - u_char __pad3[10]; + l_ulonglong st_rdev; + u_char __pad3[4]; l_longlong st_size; l_ulong st_blksize; - l_ulong st_blocks; - l_ulong __pad4; + l_ulonglong st_blocks; struct l_timespec st_atim; struct l_timespec st_mtim; struct l_timespec st_ctim; diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 32f92d8c637b..91102eeaa2be 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -189,19 +189,18 @@ struct l_old_stat { }; struct l_stat64 { - l_ushort st_dev; - u_char __pad0[10]; + l_ulonglong st_dev; + u_char __pad0[4]; l_ulong __st_ino; l_uint st_mode; l_uint st_nlink; l_ulong st_uid; l_ulong st_gid; - l_ushort st_rdev; - u_char __pad3[10]; + l_ulonglong st_rdev; + u_char __pad3[4]; l_longlong st_size; l_ulong st_blksize; - l_ulong st_blocks; - l_ulong __pad4; + l_ulonglong st_blocks; struct l_timespec st_atim; struct l_timespec st_mtim; struct l_timespec st_ctim;