From e53ce9a22fccf76734b36192d2cc10f6b560d139 Mon Sep 17 00:00:00 2001 From: sheldonh Date: Thu, 24 Oct 2002 12:57:05 +0000 Subject: [PATCH] * Modernize aio(4), providing instructions for static and dynamic kernel linking. * Fix disorder in the SEE ALSO sections of aio_*(2). * Remove unnecessary cross-references from the SEE ALSO sections of aio_*(2); config(8), kldload(8) and kldunload(8) are cross-referenced from aio(4). * Remove the KERNEL OPTIONS sections from aio_*(2), now that these pages cross-reference aio(4), which contains suitable kernel linking reference material. --- lib/libc/sys/aio_cancel.2 | 22 +--------------------- lib/libc/sys/aio_error.2 | 24 ++---------------------- lib/libc/sys/aio_read.2 | 22 +--------------------- lib/libc/sys/aio_return.2 | 22 +--------------------- lib/libc/sys/aio_suspend.2 | 22 +--------------------- lib/libc/sys/aio_waitcomplete.2 | 22 +--------------------- lib/libc/sys/aio_write.2 | 21 +-------------------- share/man/man4/aio.4 | 9 ++++++++- 8 files changed, 16 insertions(+), 148 deletions(-) diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2 index ca9660172081..30eecb5a08c7 100644 --- a/lib/libc/sys/aio_cancel.2 +++ b/lib/libc/sys/aio_cancel.2 @@ -81,33 +81,13 @@ indicates: .Fa fildes is an invalid file descriptor. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_error 2 , .Xr aio_read 2 , .Xr aio_return 2 , .Xr aio_suspend 2 , .Xr aio_write 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS The .Fn aio_cancel diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2 index 65dc1de3e6e4..08f3d9f724f3 100644 --- a/lib/libc/sys/aio_error.2 +++ b/lib/libc/sys/aio_error.2 @@ -70,25 +70,7 @@ function will fail if: .Fa iocb does not reference an outstanding asynchronous I/O request. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_cancel 2 , .Xr aio_read 2 , .Xr aio_return 2 , @@ -96,10 +78,8 @@ module as desired: .Xr aio_write 2 , .Xr fsync 2 , .Xr read 2 , -.Xr write 2 -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr write 2 , +.Xr aio 4 .Sh STANDARDS .Fn aio_error is expected to conform to the diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2 index 88889155c99b..e1256cef5039 100644 --- a/lib/libc/sys/aio_read.2 +++ b/lib/libc/sys/aio_read.2 @@ -179,34 +179,14 @@ The offset .Fa iocb->aio_offset would be invalid. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_return 2 , .Xr aio_suspend 2 , .Xr aio_waitcomplete 2 , .Xr aio_write 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS The .Fn aio_read diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2 index 8de69b1972a1..5f7e6825c6c1 100644 --- a/lib/libc/sys/aio_return.2 +++ b/lib/libc/sys/aio_return.2 @@ -72,25 +72,7 @@ function will fail if: .Fa iocb does not reference an outstanding asynchronous I/O request. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_suspend 2 , @@ -99,9 +81,7 @@ module as desired: .Xr fsync 2 , .Xr read 2 , .Xr write 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS .Fn aio_return is expected to conform to the diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2 index 0dc564bbafe7..f03d6eb4248e 100644 --- a/lib/libc/sys/aio_suspend.2 +++ b/lib/libc/sys/aio_suspend.2 @@ -85,33 +85,13 @@ valid. .It Bq Er EINTR the suspend was interrupted by a signal. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_return 2 , .Xr aio_waitcomplete 2 , .Xr aio_write 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS .Fn aio_suspend is expected to conform to the diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2 index 08009126146a..573f002f74f2 100644 --- a/lib/libc/sys/aio_waitcomplete.2 +++ b/lib/libc/sys/aio_waitcomplete.2 @@ -108,25 +108,7 @@ asynchronous I/O requests completed. The specified time limit expired before any asynchronous I/O requests completed. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO -.Xr aio 4 , .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_read 2 , @@ -136,9 +118,7 @@ module as desired: .Xr fsync 2 , .Xr read 2 , .Xr write 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS The .Fn aio_waitcomplete diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2 index 3ca9e1fe8041..fae6fc635bc1 100644 --- a/lib/libc/sys/aio_write.2 +++ b/lib/libc/sys/aio_write.2 @@ -173,32 +173,13 @@ The offset .Fa iocb->aio_offset would be invalid. .El -.Sh KERNEL OPTIONS -The following kernel configuration option -(see -.Xr config 8 ) -is required: -.Pp -.Dl "options VFS_AIO" -.Pp -If you do not want AIO support included in the kernel, but -want to use it occasionally, do not add the -.Dv VFS_AIO -option. Instead, load the -.Nm aio -module as desired: -.Pp -.Dl kldload aio -.Pp .Sh SEE ALSO .Xr aio_cancel 2 , .Xr aio_error 2 , .Xr aio_return 2 , .Xr aio_suspend 2 , .Xr aio_waitcomplete 2 , -.Xr config 8 , -.Xr kldload 8 , -.Xr kldunload 8 +.Xr aio 4 .Sh STANDARDS .Fn aio_write is expected to conform to the diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4 index be7407d03a68..729aee6a33d2 100644 --- a/share/man/man4/aio.4 +++ b/share/man/man4/aio.4 @@ -34,7 +34,11 @@ .Nm aio .Nd asynchronous I/O .Sh SYNOPSIS +To link into the kernel: .Cd "options VFS_AIO" +.Pp +To load as a kernel loadable module: +.Dl kldload aio .Sh DESCRIPTION The .Nm @@ -49,7 +53,10 @@ dynamic kernel module. .Xr aio_return 2 , .Xr aio_suspend 2 , .Xr aio_waitcomplete 2 , -.Xr aio_write 2 +.Xr aio_write 2 , +.Xr config 8 , +.Xr kldload 8 , +.Xr kldunload 8 .Sh HISTORY The .Nm