From nobody Fri Apr 28 08:57:14 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 4Q761R0WCWz48CG1; Fri, 28 Apr 2023 08:57:15 +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 4Q761Q6VY7z4RmT; Fri, 28 Apr 2023 08:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672234; 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=qEmxkc2QeWb4z9XDMFy5HlvaS1j70tZbAwbNNgMm/sY=; b=iOUED7LDjacGQHTUxHYq9A+KZHRIxXQKxqiq5FbUn5OBvAX96f/PRGjnHiFNBtpUPQQD48 +omIQvEDoIMEQ68BvCDkZ04sjDG3gfGB519n8OvMcnuusv7DZXxcycD6WSTnA3ynLKZ0VB uZmnf4xpPSMN6H0YDlDNpc+o7dyey5TGpwNacDVdpE7wHbfiOxZ/n6ZcZGYuKRF9vEymKE 6eYQqsh5tBy8NSqGjpT4S7/VCPr1vLF5mlseL4izuxC7V/wSEAK219TGwNEQfcHcdHl0Qe YSr7+ii0+ox5081Vkpb8VOL2exHTPlF9rXHqTf1gaRtPix9bMKT978ygOgXlFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672234; 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=qEmxkc2QeWb4z9XDMFy5HlvaS1j70tZbAwbNNgMm/sY=; b=U+AvW6DbzRBCv4CpoM0E73l3FlA1H5a7QXV0hhR4V03e0vP51vljBfGk6ISciVSaWIuRi/ 2wGwmICY+SA17MIsk7lMu4fdleOHjbX3D0lwHYW2k+EbqJ0FULPn0ijSFocOpWhDbHemON Y6/eV8te1oC77NqobOPTAAuCOm03oyQGh/hq0PKZ5yMK6qyYiupPi/KcQfF+Zgs3GKvdLw VwMFtsQ2bJpAD54LCndaMGGrLQUupNVXAijt3D37lJp8Er0NGuQWaIMSNmzjfODuXkV4Iw wGAySzvfSAxuYqLf5N40Kjs//iJjh08yRM2rxaYwifO/Kxns4/tV3IBThfRCcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682672234; a=rsa-sha256; cv=none; b=PEqAx8YS4Xkn8bbqjnnwW+Gj4FGd27e49W2euFiluaqDLm8ignrVZdyveLf8gID2FctAdL tJ9fpT9e3m58rF8yLN727bJzNwt8WDCMnMP0pM75EIbDpsuyPnp8kIO5izzAtvSfOjywWJ 8ANhFd+Bf5MvWj1gLvTRBb79i6gULVFoLeJIY4xPG8kNl6794N/uhqSvAUBann6uBBXv4Y Mp40gc5pE8+8+DjiviwkHbftyRK0lASaZthYrK9gwWDIJguG+M61ZT8vINMUZex3sFDf1u tmq/KkYaPgFUWDG7leLnVZCUFO/XziUrEWY/on4mYLXNThrWv+NJHJ7Cl+6xDw== 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 4Q761Q5ThQzt08; Fri, 28 Apr 2023 08:57:14 +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 33S8vEvY018032; Fri, 28 Apr 2023 08:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S8vEAe018031; Fri, 28 Apr 2023 08:57:14 GMT (envelope-from git) Date: Fri, 28 Apr 2023 08:57:14 GMT Message-Id: <202304280857.33S8vEAe018031@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: e0bfe0d62ca7 - main - linux(4): Make struct newstat to match actual Linux 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: e0bfe0d62ca708c8c6173296cc05f6bbfb79b2ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bfe0d62ca708c8c6173296cc05f6bbfb79b2ee commit e0bfe0d62ca708c8c6173296cc05f6bbfb79b2ee Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:01 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-28 08:55:01 +0000 linux(4): Make struct newstat to match actual Linux one In the struct stat the st_dev, st_rdev are unsigned long. --- 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 11cc9f05c6f5..4aa45ad8ca96 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 80311ebb988e..f26ff5c216d2 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 1b6852286662..f3c55ac0fd6b 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 dd99b4a6d721..db4b2990b92d 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;