The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=25fec55b86959541fc93d49dffb2e2c549d1de88
commit 25fec55b86959541fc93d49dffb2e2c549d1de88
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:25 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:25 +0000
freebsd32: remove freebsd11_freebsd32_getdents
It's exactly the same as freebsd11_getdents.
Reviewed by: kevans
---
sys/compat/freebsd32/freebsd32_misc.c | 13 -------------
sys/compat/freebsd32/freebsd32_proto.h | 7 -------
sys/compat/freebsd32/freebsd32_syscall.h | 2 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 2 +-
sys/compat/freebsd32/freebsd32_sysent.c | 2 +-
sys/compat/freebsd32/syscalls.master | 2 +-
6 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_misc.c
b/sys/compat/freebsd32/freebsd32_misc.c
index c7c6036e81e8..e2fb6fae1aa9 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -1942,19 +1942,6 @@ freebsd11_freebsd32_getdirentries(struct thread *td,
}
return (error);
}
-
-int
-freebsd11_freebsd32_getdents(struct thread *td,
- struct freebsd11_freebsd32_getdents_args *uap)
-{
- struct freebsd11_freebsd32_getdirentries_args ap;
-
- ap.fd = uap->fd;
- ap.buf = uap->buf;
- ap.count = uap->count;
- ap.basep = NULL;
- return (freebsd11_freebsd32_getdirentries(td, &ap));
-}
#endif /* COMPAT_FREEBSD11 */
#ifdef COMPAT_FREEBSD6
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index 659339eb3715..92d1408a539f 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -1223,11 +1223,6 @@ struct freebsd11_freebsd32_getdirentries_args {
char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
char basep_l_[PADL_(int32_t *)]; int32_t * basep; char
basep_r_[PADR_(int32_t *)];
};
-struct freebsd11_freebsd32_getdents_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
- char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)];
-};
struct freebsd11_freebsd32_fhstat_args {
char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle *
u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
char sb_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 *
sb; char sb_r_[PADR_(struct freebsd11_stat32 *)];
@@ -1265,7 +1260,6 @@ int freebsd11_freebsd32_stat(struct thread *,
struct freebsd11_freebsd32_stat_ar
int freebsd11_freebsd32_fstat(struct thread *, struct
freebsd11_freebsd32_fstat_args *);
int freebsd11_freebsd32_lstat(struct thread *, struct
freebsd11_freebsd32_lstat_args *);
int freebsd11_freebsd32_getdirentries(struct thread *, struct
freebsd11_freebsd32_getdirentries_args *);
-int freebsd11_freebsd32_getdents(struct thread *, struct
freebsd11_freebsd32_getdents_args *);
int freebsd11_freebsd32_fhstat(struct thread *, struct
freebsd11_freebsd32_fhstat_args *);
int freebsd11_freebsd32_kevent(struct thread *, struct
freebsd11_freebsd32_kevent_args *);
int freebsd11_freebsd32_fstatat(struct thread *, struct
freebsd11_freebsd32_fstatat_args *);
@@ -1362,7 +1356,6 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_AIO_READ
#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_AIO_WRITE
#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_LIO_LISTIO
-#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_getdents AUE_O_GETDENTS
#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index d263e7f4f7e7..e97827d96169 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -229,7 +229,7 @@
#define FREEBSD32_SYS_freebsd32_aio_read 255
#define FREEBSD32_SYS_freebsd32_aio_write 256
#define FREEBSD32_SYS_freebsd32_lio_listio 257
-#define FREEBSD32_SYS_freebsd11_freebsd32_getdents 272
+#define FREEBSD32_SYS_freebsd11_getdents 272
#define FREEBSD32_SYS_lchmod 274
/* 275 is obsolete netbsd_lchown */
#define FREEBSD32_SYS_freebsd32_lutimes 276
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index 9d5c19a06774..13ed9e9dd591 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -281,7 +281,7 @@ const char *freebsd32_syscallnames[] = {
"#269", /* 269 = nosys */
"#270", /* 270 = nosys */
"#271", /* 271 = nosys */
- "compat11.freebsd32_getdents", /* 272 = freebsd11
freebsd32_getdents */
+ "compat11.getdents", /* 272 = freebsd11 getdents */
"#273", /* 273 = nosys */
"lchmod", /* 274 = lchmod */
"obs_netbsd_lchown", /* 275 = obsolete netbsd_lchown
*/
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index 285ec61747a0..0a2fffabdeaf 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -334,7 +334,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 269 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 270 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 271 = nosys
*/
- { compat11(AS(freebsd11_freebsd32_getdents_args),freebsd32_getdents),
.sy_auevent = AUE_O_GETDENTS, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 272 = freebsd11 freebsd32_getdents */
+ { compat11(AS(freebsd11_getdents_args),getdents), .sy_auevent =
AUE_O_GETDENTS, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },
/* 272 = freebsd11 getdents */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 273 = nosys
*/
{ .sy_narg = AS(lchmod_args), .sy_call = (sy_call_t *)sys_lchmod,
.sy_auevent = AUE_LCHMOD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },
/* 274 = lchmod */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 275 =
obsolete netbsd_lchown */
diff --git a/sys/compat/freebsd32/syscalls.master
b/sys/compat/freebsd32/syscalls.master
index a88568b620d8..0408c7ecf265 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -505,7 +505,7 @@
269 AUE_NULL UNIMPL nosys
270 AUE_NULL UNIMPL nosys
271 AUE_NULL UNIMPL nosys
-272 AUE_O_GETDENTS COMPAT11 { int freebsd32_getdents(int fd, char *buf, \
+272 AUE_O_GETDENTS COMPAT11|NOPROTO { int getdents(int fd, char *buf, \
int count); }
273 AUE_NULL UNIMPL nosys
274 AUE_LCHMOD NOPROTO { int lchmod(const char *path, mode_t mode); }
