git: b3286afae364 - main - Reallocate syscall numbers for aio_writev and aio_readv

[Alan Somers]

The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=b3286afae364c065183da3a910a33db3032529d4

commit b3286afae364c065183da3a910a33db3032529d4
Author:     Alan Somers <asomers at FreeBSD.org>
AuthorDate: 2021-01-05 23:28:23 +0000
Commit:     Alan Somers <asomers at FreeBSD.org>
CommitDate: 2021-01-08 02:49:27 +0000

    Reallocate syscall numbers for aio_writev and aio_readv
    
    The originally chosen numbers interfere with downstream projects'
    syscalls.  Move them to the end of the syscall table instead.
    
    Reported by:    jrtc27
    Reviewed by:    brooks
    MFC-With:       022ca2fc7fe08d51f33a1d23a9be49e6d132914e
    Differential Revision:  022ca2fc7fe08d51f33a1d23a9be49e6d132914e
---
 sys/compat/freebsd32/syscalls.master | 10 ++++++----
 sys/kern/syscalls.master             | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index ca0db9a76b1e..93d5a251d8ab 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -493,10 +493,8 @@
 257	AUE_LIO_LISTIO	STD	{ int freebsd32_lio_listio(int mode, \
 				    struct aiocb32 * const *acb_list, \
 				    int nent, struct sigevent32 *sig); }
-258	AUE_AIO_WRITEV	STD	{ int freebsd32_aio_writev( \
-				    struct aiocb32 *aiocbp); }
-259	AUE_AIO_READV	STD	{ int freebsd32_aio_readv( \
-				    struct aiocb32 *aiocbp); }
+258	AUE_NULL	UNIMPL	nosys
+259	AUE_NULL	UNIMPL	nosys
 260	AUE_NULL	UNIMPL	nosys
 261	AUE_NULL	UNIMPL	nosys
 262	AUE_NULL	UNIMPL	nosys
@@ -1172,5 +1170,9 @@
 				    const char *path); }
 577	AUE_SPECIALFD	NOPROTO	{ int __specialfd(int type, const void *req, \
 				    size_t len); }
+578	AUE_AIO_WRITEV	STD	{ int freebsd32_aio_writev( \
+				    struct aiocb32 *aiocbp); }
+579	AUE_AIO_READV	STD	{ int freebsd32_aio_readv( \
+				    struct aiocb32 *aiocbp); }
 
 ; vim: syntax=off
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index aaa0a1277461..5c6ebeb9b52f 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1477,17 +1477,7 @@
 		    _In_opt_ struct sigevent *sig
 		);
 	}
-258	AUE_AIO_WRITEV	STD {
-		int aio_writev(
-		    _Inout_ struct aiocb *aiocbp
-		);
-	}
-259	AUE_AIO_READV	STD {
-		int aio_readv(
-		    _Inout_ struct aiocb *aiocbp
-		);
-	}
-260-271	AUE_NULL	UNIMPL	nosys
+258-271	AUE_NULL	UNIMPL	nosys
 272	AUE_O_GETDENTS	COMPAT11 {
 		int getdents(
 		    int fd,
@@ -3258,6 +3248,16 @@
 		    size_t len
 		);
 	}
+578	AUE_AIO_WRITEV	STD {
+		int aio_writev(
+		    _Inout_ struct aiocb *aiocbp
+		);
+	}
+579	AUE_AIO_READV	STD {
+		int aio_readv(
+		    _Inout_ struct aiocb *aiocbp
+		);
+	}
 
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master