git: 5e43a15ba4d9 - stable/13 - linux(4): Regen for struct l_old_stat changes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Jun 2023 08:20:19 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=5e43a15ba4d9e5f039f1a0ecbcbb86b3ba8c1159
commit 5e43a15ba4d9e5f039f1a0ecbcbb86b3ba8c1159
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-04-28 08:55:01 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-06-29 08:15:33 +0000
linux(4): Regen for struct l_old_stat changes
(cherry picked from commit 023e6884967d0cb0b330eb15264d159619b0533b)
---
sys/amd64/linux32/linux32_proto.h | 4 ++--
sys/amd64/linux32/linux32_systrace_args.c | 8 ++++----
sys/i386/linux/linux_proto.h | 10 ++-------
sys/i386/linux/linux_syscall.h | 1 -
sys/i386/linux/linux_syscalls.c | 2 +-
sys/i386/linux/linux_sysent.c | 2 +-
sys/i386/linux/linux_systrace_args.c | 34 ++++---------------------------
7 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index d76b685b17e6..79a7f54b8ce9 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -89,7 +89,7 @@ struct linux_lchown16_args {
};
struct linux_stat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
+ char up_l_[PADL_(struct l_old_stat *)]; struct l_old_stat * up; char up_r_[PADR_(struct l_old_stat *)];
};
struct linux_lseek_args {
char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)];
@@ -273,7 +273,7 @@ struct linux_symlink_args {
};
struct linux_lstat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char up_l_[PADL_(struct linux_lstat *)]; struct linux_lstat * up; char up_r_[PADR_(struct linux_lstat *)];
+ char up_l_[PADL_(struct l_old_stat *)]; struct l_old_stat * up; char up_r_[PADR_(struct l_old_stat *)];
};
struct linux_readlink_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 8dd85ea9720a..fa5a50a0dd86 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -143,7 +143,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 18: {
struct linux_stat_args *p = params;
uarg[0] = (intptr_t)p->path; /* char * */
- uarg[1] = (intptr_t)p->up; /* struct linux_stat * */
+ uarg[1] = (intptr_t)p->up; /* struct l_old_stat * */
*n_args = 2;
break;
}
@@ -562,7 +562,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 84: {
struct linux_lstat_args *p = params;
uarg[0] = (intptr_t)p->path; /* char * */
- uarg[1] = (intptr_t)p->up; /* struct linux_lstat * */
+ uarg[1] = (intptr_t)p->up; /* struct l_old_stat * */
*n_args = 2;
break;
}
@@ -3480,7 +3480,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland struct linux_stat *";
+ p = "userland struct l_old_stat *";
break;
default:
break;
@@ -4086,7 +4086,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland struct linux_lstat *";
+ p = "userland struct l_old_stat *";
break;
default:
break;
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index f877c94a73fb..1957c8d0c1b3 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -89,7 +89,7 @@ struct linux_lchown16_args {
};
struct linux_stat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
+ char up_l_[PADL_(struct l_old_stat *)]; struct l_old_stat * up; char up_r_[PADR_(struct l_old_stat *)];
};
struct linux_lseek_args {
char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)];
@@ -127,10 +127,6 @@ struct linux_ptrace_args {
struct linux_alarm_args {
char secs_l_[PADL_(l_uint)]; l_uint secs; char secs_r_[PADR_(l_uint)];
};
-struct linux_fstat_args {
- char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
- char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
-};
struct linux_pause_args {
register_t dummy;
};
@@ -265,7 +261,7 @@ struct linux_symlink_args {
};
struct linux_lstat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char up_l_[PADL_(struct l_stat *)]; struct l_stat * up; char up_r_[PADR_(struct l_stat *)];
+ char up_l_[PADL_(struct l_old_stat *)]; struct l_old_stat * up; char up_r_[PADR_(struct l_old_stat *)];
};
struct linux_readlink_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
@@ -1716,7 +1712,6 @@ int linux_getuid16(struct thread *, struct linux_getuid16_args *);
int linux_stime(struct thread *, struct linux_stime_args *);
int linux_ptrace(struct thread *, struct linux_ptrace_args *);
int linux_alarm(struct thread *, struct linux_alarm_args *);
-int linux_fstat(struct thread *, struct linux_fstat_args *);
int linux_pause(struct thread *, struct linux_pause_args *);
int linux_utime(struct thread *, struct linux_utime_args *);
int linux_access(struct thread *, struct linux_access_args *);
@@ -2130,7 +2125,6 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *);
#define LINUX_SYS_AUE_linux_stime AUE_SETTIMEOFDAY
#define LINUX_SYS_AUE_linux_ptrace AUE_PTRACE
#define LINUX_SYS_AUE_linux_alarm AUE_NULL
-#define LINUX_SYS_AUE_linux_fstat AUE_FSTAT
#define LINUX_SYS_AUE_linux_pause AUE_NULL
#define LINUX_SYS_AUE_linux_utime AUE_UTIME
#define LINUX_SYS_AUE_linux_access AUE_ACCESS
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index a3a6fe680a7c..a77c91896fd6 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -31,7 +31,6 @@
#define LINUX_SYS_linux_stime 25
#define LINUX_SYS_linux_ptrace 26
#define LINUX_SYS_linux_alarm 27
-#define LINUX_SYS_linux_fstat 28
#define LINUX_SYS_linux_pause 29
#define LINUX_SYS_linux_utime 30
#define LINUX_SYS_linux_access 33
diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c
index 95e44584ef2c..1454490c9318 100644
--- a/sys/i386/linux/linux_syscalls.c
+++ b/sys/i386/linux/linux_syscalls.c
@@ -35,7 +35,7 @@ const char *linux_syscallnames[] = {
"linux_stime", /* 25 = linux_stime */
"linux_ptrace", /* 26 = linux_ptrace */
"linux_alarm", /* 27 = linux_alarm */
- "linux_fstat", /* 28 = linux_fstat */
+ "#28", /* 28 = fstat */
"linux_pause", /* 29 = linux_pause */
"linux_utime", /* 30 = linux_utime */
"#31", /* 31 = stty */
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index de0493a6dda6..3d92ce04eb52 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -45,7 +45,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_stime, .sy_auevent = AUE_SETTIMEOFDAY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 25 = linux_stime */
{ .sy_narg = AS(linux_ptrace_args), .sy_call = (sy_call_t *)linux_ptrace, .sy_auevent = AUE_PTRACE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 26 = linux_ptrace */
{ .sy_narg = AS(linux_alarm_args), .sy_call = (sy_call_t *)linux_alarm, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 27 = linux_alarm */
- { .sy_narg = AS(linux_fstat_args), .sy_call = (sy_call_t *)linux_fstat, .sy_auevent = AUE_FSTAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 28 = linux_fstat */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 28 = fstat */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_pause, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 29 = linux_pause */
{ .sy_narg = AS(linux_utime_args), .sy_call = (sy_call_t *)linux_utime, .sy_auevent = AUE_UTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 30 = linux_utime */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 31 = stty */
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 27d277e98aa3..72c6ba134b26 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -143,7 +143,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 18: {
struct linux_stat_args *p = params;
uarg[0] = (intptr_t)p->path; /* char * */
- uarg[1] = (intptr_t)p->up; /* struct linux_stat * */
+ uarg[1] = (intptr_t)p->up; /* struct l_old_stat * */
*n_args = 2;
break;
}
@@ -213,14 +213,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 1;
break;
}
- /* linux_fstat */
- case 28: {
- struct linux_fstat_args *p = params;
- iarg[0] = p->fd; /* l_uint */
- uarg[1] = (intptr_t)p->up; /* struct linux_stat * */
- *n_args = 2;
- break;
- }
/* linux_pause */
case 29: {
*n_args = 0;
@@ -570,7 +562,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 84: {
struct linux_lstat_args *p = params;
uarg[0] = (intptr_t)p->path; /* char * */
- uarg[1] = (intptr_t)p->up; /* struct l_stat * */
+ uarg[1] = (intptr_t)p->up; /* struct l_old_stat * */
*n_args = 2;
break;
}
@@ -3519,7 +3511,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland struct linux_stat *";
+ p = "userland struct l_old_stat *";
break;
default:
break;
@@ -3621,19 +3613,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
- /* linux_fstat */
- case 28:
- switch (ndx) {
- case 0:
- p = "l_uint";
- break;
- case 1:
- p = "userland struct linux_stat *";
- break;
- default:
- break;
- };
- break;
/* linux_pause */
case 29:
break;
@@ -4138,7 +4117,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland struct l_stat *";
+ p = "userland struct l_old_stat *";
break;
default:
break;
@@ -8737,11 +8716,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_fstat */
- case 28:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* linux_pause */
case 29:
/* linux_utime */