From nobody Thu Jun 29 08:20:16 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 4QsBG91kdPz4knVF; Thu, 29 Jun 2023 08:20:17 +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 4QsBG85wZsz3tqJ; Thu, 29 Jun 2023 08:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026816; 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=DqI0h4RAJo9rWy5KY5M51Ep+jgQfRSvcSy17WmhQaiU=; b=iYrAoC5bJBKiDpDklPh+krMvx40YF6BphPmqg1VMOLu56NibdOBFQYg/QbhAARlP7Vb/oJ 6zrC8yehX65iHzgKVN49ZeC72SVOyb2e/ajcCEaPA9jXHdPVPjyBV8w50gzuH7Ju0G1fk7 hIJvMLYv9Vx0nos+/iWqjQK4q8N8uAKdH1REGLnZFo+DdJoOM57qRGW3ni5tBl/zWgoGWj X+aN9JOPupf64i7fw/0PJ4gPf2yuNKBsZlUgjn38hIGH1LuXGhfebEUJCF0ohu4T4abEDA 6y0+EBvUrii1haO5G3r13qQj0km9Vpl2Qs2gCLE3qUgN9wUtHsrouvjmnubWxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026816; 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=DqI0h4RAJo9rWy5KY5M51Ep+jgQfRSvcSy17WmhQaiU=; b=gP1B5f93SojnJqZP1KzgsVuqDP/ouyubCAF5y550mYnb+rqa9tJB23MCiMv3ElJH3BAR8f fd1d9GNWhbjSVLV08udZH+3/Qg2eR3MFx/0aBcscMqNaSRavp9NoP4tPp1gAWx38LAovxM ncC1Obt5XBK3/xXq15XYvZZylu6g+jOGRDK1FJ+Yw7Em9NYLYtwIK0Q+qRjQXlEiccb5F5 vTOBJ3pPA6gTVOxAZk3ABJPfLFuD1OT0l8JaAgfWqZ9j7hZ5YGGU5EAjxW2vPo8k1KQ3SR SiCASif7VR6qfI2yvTBTc0D0Rek/jkwAv/kvzaDWvtQQ167BpUQMM6DbPoic+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026816; a=rsa-sha256; cv=none; b=oN6x38VESf5Ez0NZ18EXxt0FYyGO7UbX09xe6KjmEXtVc440N0N7/mItIonu0sUP+GubUn LLrRGibgYEmOyB0MTCENNcx9ZGCqLQLERRZGOm0sqzXi41CMY+GYJXvRdQfdZfDaxTcF8j xYnnZCkaV/C6Qm7YHxZk5TuMVFzKAgf7s/xMX4CbZBssutDpCfYTgIJX/Eaf/ZblinqVMi nCKFkDThZITMkXTtsHxD5wKluDWXU25Z2Uc46YdrnKzlEhG2k4TPmkZB0pifMEAKxzmUIJ ql0M2pb8984RFQOnx8Xyz+1qs6YWUs5MHNhvkCk5CZJ/cIuZqvbFpB3wlaeFLw== 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 4QsBG852Mwz17sR; Thu, 29 Jun 2023 08:20:16 +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 35T8KG1r082884; Thu, 29 Jun 2023 08:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KGT4082879; Thu, 29 Jun 2023 08:20:16 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:16 GMT Message-Id: <202306290820.35T8KGT4082879@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: aaf17ef31c38 - stable/13 - linux(4): Rename obsolete old struct l_stat to struct l_old_stat 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: aaf17ef31c383e357dd622353002fb07a88ae518 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aaf17ef31c383e357dd622353002fb07a88ae518 commit aaf17ef31c383e357dd622353002fb07a88ae518 Author: Dmitry Chagin AuthorDate: 2023-04-28 08:54:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:29 +0000 linux(4): Rename obsolete old struct l_stat to struct l_old_stat (cherry picked from commit a408fc097f43b80fd1477196e595edc796804520) --- 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 d0c966ad3c92..4552c60e260b 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 c4b70b2a6aaa..7e10ff357e00 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;