From nobody Fri Apr 28 08:57:10 2023 X-Original-To: dev-commits-src-main@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 4Q761L3R2tz48Byw; Fri, 28 Apr 2023 08:57:10 +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 4Q761L2gsWz4Rdt; Fri, 28 Apr 2023 08:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672230; 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=ecGpREDnJWKPkTuksc1vqJYeFZ4ZPMKQ7AexPAYtruE=; b=eev00vKzdYnBhaae6HYEVBN1/YFduMEDHQbBknJGsfEqcNV2x9vCz7Tc1Bu6QLxnSsIjs4 LwWdcZ9OIoe2Di8+MucY91rV3a2y2WzOMK6NS8lho1xNaQVMFfrSkx9Q+BZK0h8cWqjyK5 ZGED6tJAuD9rgetwphro2ULrfbfplbkuYgVHMScbKiRCCKKGR19XSoLx2fDDp4SLQkvXpp W8d6ETEpBz6sCVHMXHWk9NhLZsIXlmT1foBrTMLQMr8g/5QjeemQCnM7oO2Ss6tyZs7qTZ WeH6qlMtBk4rw9hkQWswoi4KeWjZRxvx+irSaZWujm/MwHzRDufBKekml/cEDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672230; 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=ecGpREDnJWKPkTuksc1vqJYeFZ4ZPMKQ7AexPAYtruE=; b=LHMD1bIqw1H2SZFOcQBOl5DCaqH+iDyqP2w+w++Jjm1G2stUuYmiPe8oszK6fBGlqOnbc4 lP2S8Q55atfd1RkXvcLsOazNiFshiAKKcv7SJbcikvw2cd8QbIziAKPFO2Do4RUXnsKjfD JTBf5KdX1AnhJ2Ulrz5j/48G8WDR8+suO4mS6OhTGBqNPlSUvq70PFef6jQVU2vvUAk3tf Sgzvj0TWD3Fbzrok0ts9EGlP9IBWzVz2z8yInUEDyGVE4oLT/JMGVu0tlkhlCgbIXjnDaX iO8DPRN5uJjx/4TSxsoiwNHfMLNDDduZfwC5dzhm7c5UwTp3R4mLZ07X9U8xfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682672230; a=rsa-sha256; cv=none; b=Dx5zMX8XIsvBhfgWnQM4qZ66XGRzI5tEHD9CgGrEVxuOyOnDVDaVCqqQbsfuBRfLllWkVB 38YyYy9NxymZouVZbWoxc7cABMftM2GvQ9mC1f6nchJL7EWbON09DZpGX7Nu3gWHKoJIXo mYjAKv4FfwwfMNjBdRZCqw8b/utJDXPCL6ysRl3+dQH9jR8EaprweOh9SpYqXyXhqGOe3o dIAVOResr6D6nLfAeOTL0a4vyjptGSNU0qXSLnruI/6YIAd7QGs5TN/J2SfIq3Pi6kEUiu 8leJb37pXD0xR2mbJfldrH8hxU6ibrF//lBykTH3TTVUCT+CTAM4epbkI60cGQ== 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 4Q761L1mqRzt07; Fri, 28 Apr 2023 08:57:10 +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 33S8vAWQ017946; Fri, 28 Apr 2023 08:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S8vAFK017945; Fri, 28 Apr 2023 08:57:10 GMT (envelope-from git) Date: Fri, 28 Apr 2023 08:57:10 GMT Message-Id: <202304280857.33S8vAFK017945@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: a408fc097f43 - main - linux(4): Rename obsolete old struct l_stat to struct l_old_stat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a408fc097f43b80fd1477196e595edc796804520 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a408fc097f43b80fd1477196e595edc796804520 commit a408fc097f43b80fd1477196e595edc796804520 Author: Dmitry Chagin AuthorDate: 2023-04-28 08:54:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-28 08:54:59 +0000 linux(4): Rename obsolete old struct l_stat to struct l_old_stat --- sys/amd64/linux32/linux.h | 3 ++- sys/compat/linux/linux_stats.c | 8 ++++---- sys/i386/linux/linux.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 8acc5bc0f195..80311ebb988e 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -199,7 +199,8 @@ struct l_newstat { l_ulong __unused5; }; -struct l_stat { +/* __old_kernel_stat now */ +struct l_old_stat { l_ushort st_dev; l_ulong st_ino; l_ushort st_mode; diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 04589c33547b..58c378d6bc08 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -222,9 +222,9 @@ linux_newfstat(struct thread *td, struct linux_newfstat_args *args) #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) static int -stat_copyout(struct stat *buf, void *ubuf) +old_stat_copyout(struct stat *buf, void *ubuf) { - struct l_stat lbuf; + struct l_old_stat lbuf; bzero(&lbuf, sizeof(lbuf)); lbuf.st_dev = dev_to_ldev(buf->st_dev); @@ -266,7 +266,7 @@ linux_stat(struct thread *td, struct linux_stat_args *args) if (error) { return (error); } - return (stat_copyout(&buf, args->up)); + return (old_stat_copyout(&buf, args->up)); } int @@ -286,7 +286,7 @@ linux_lstat(struct thread *td, struct linux_lstat_args *args) if (error) { return (error); } - return (stat_copyout(&buf, args->up)); + return (old_stat_copyout(&buf, args->up)); } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 114d59d4eae0..dd99b4a6d721 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -172,7 +172,8 @@ struct l_newstat { l_ulong __unused5; }; -struct l_stat { +/* __old_kernel_stat now */ +struct l_old_stat { l_ushort st_dev; l_ulong st_ino; l_ushort st_mode;