From nobody Fri Apr 28 08:57:19 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 4Q761X0kpGz48C0N; Fri, 28 Apr 2023 08:57:20 +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 4Q761W3WVVz4Ryr; Fri, 28 Apr 2023 08:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672239; 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=ZI0FbC2mMNZAzaipbucsjNFKbJ38LIeKPN5mkRty/jc=; b=YaKh2pDrCqi7IB8NaOD6G7p/dPMj3ZIrZFYdL0o+yrKCHArvaV9wiNA9xNZ8CWlvTgVOOj tCJP32cJCGed4bpf/CFEUiMCG3E67nEzXbWJ/Vowlagd4/81UtVtWoW1P7MwKifi4YivWq /nXN9Mrv/sot1S+hFegi2SEXKX5L3GCXegdKwsohmjajs/O505UEndzFU1iupJW2MQbbOF 6G4D5yY4tupBbojPyJssWUFSdSvYqZdi2CYfwiLGVgXU4gSZ+1mGS3hNdF0GHDpGJLJEev k9N95jq4yPpnT/1Oy1mJgY+d0tkXWdpHyzd9XRa/oOk293K8Tt9c7QguHVepnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672239; 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=ZI0FbC2mMNZAzaipbucsjNFKbJ38LIeKPN5mkRty/jc=; b=QtimZQQmN2DgHBUChX5aQ2ZQHH20D1yKqwcJ6NDTeOsl9lm0KC6zmzhs74QjWUogEZMBSf Ro/9VyDPsr7E9gEqnIm0E12z+LIx08b4TsenOXbWvAjjRfLlyzSz6zuqdd1tn/Ma0c9mT4 EiTCRJVrP+pNiSH9/89IXMp014kAVrTMZZCyTexPxirtnWQ8yJU2lnJ2s2f3cwy2TWOEmR s0sJFSYu2+0a32A4jBII73NX9mT56vwNw4JAolm7AiPwRGH+O9X0+Ltl+oW4w+EjFruVsw Lq82AchS9f/TQjmmuTHkosH/Y6EyjBOVSf5sDyB/D+1njRxCxWMMCx2vfdRCww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682672239; a=rsa-sha256; cv=none; b=EohZOVQHGl+OWdQZrqTDqGYepATS2mWjJHMN9yMC1kG60224e9EvacN75jglVhxDqCCYvt FvVVyl7U3Wwr9kUFTA7aNgCPIzbVtXbFijPKBB6t0O1qbbZgBwVhxZ2k2MItGRDVLgY0Yv bdE8xfAOA0sqCMqG6fp+INqkRjAoGJAIQLfSfhLEGQE9iCGP9bF6ZHU+CjeaNnEUD45h23 MVdXq4T4dP2MbNsC6o2bEG1Ev0mIaazSTBiDyDWMIQ24Mtel5dEivVn/fW9LTocL4mVkrF roI3TUccEqvDqCLK8S6URZ4scW80GW8bPslReggmMhAbMa+3gfdtGLm5XIsc/A== 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 4Q761W22HxztRg; Fri, 28 Apr 2023 08:57:19 +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 33S8vJXl018120; Fri, 28 Apr 2023 08:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S8vJ2i018119; Fri, 28 Apr 2023 08:57:19 GMT (envelope-from git) Date: Fri, 28 Apr 2023 08:57:19 GMT Message-Id: <202304280857.33S8vJ2i018119@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: 80d8a4a00308 - main - linux(4): Make struct stat64 to match Linux actual one 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: 80d8a4a0030849229cb9ebd434682ef927bc9963 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=80d8a4a0030849229cb9ebd434682ef927bc9963 commit 80d8a4a0030849229cb9ebd434682ef927bc9963 Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:04 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-28 08:55:04 +0000 linux(4): Make struct stat64 to match Linux actual one --- 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 2d4e5541f2b5..652dfccd75f1 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 826cb1bfffb0..a447653f2ce0 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;