From a408fc097f43b80fd1477196e595edc796804520 Mon Sep 17 00:00:00 2001
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Fri, 28 Apr 2023 11:54:59 +0300
Subject: [PATCH] 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;