Submit, retrieve, or poll aio requests for completion through a file descriptor. Untested. Signed-off-by: Davi E. M. Arnaut --- Index: linux-2.6/fs/pollfs/Makefile =================================================================== --- linux-2.6.orig/fs/pollfs/Makefile +++ linux-2.6/fs/pollfs/Makefile @@ -4,3 +4,4 @@ pollfs-y := file.o pollfs-$(CONFIG_POLLFS_SIGNAL) += signal.o pollfs-$(CONFIG_POLLFS_TIMER) += timer.o pollfs-$(CONFIG_POLLFS_FUTEX) += futex.o +pollfs-$(CONFIG_POLLFS_AIO) += aio.o Index: linux-2.6/fs/pollfs/aio.c =================================================================== --- /dev/null +++ linux-2.6/fs/pollfs/aio.c @@ -0,0 +1,103 @@ +/* + * pollable aio + * + * Copyright (C) 2007 Davi E. M. Arnaut + * + * Licensed under the GNU GPL. See the file COPYING for details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct pfs_aio { + struct kioctx *ioctx; + struct pfs_file file; +}; + +static ssize_t read(struct pfs_aio *evs, struct io_event __user *uioevt) +{ + int ret; + + ret = sys_io_getevents(evs->ioctx->user_id, 0, 1, uioevt, NULL); + + if (!ret) + ret = -EAGAIN; + else if (ret > 0) + ret = 0; + + return ret; +} + +static ssize_t write(struct pfs_aio *evs, const struct iocb __user *uiocb) +{ + struct iocb iocb; + + if (copy_from_user(&iocb, uiocb, sizeof(iocb))) + return -EFAULT; + + return io_submit_one(evs->ioctx, uiocb, &iocb); +} + +static int poll(struct pfs_aio *evs) +{ + int ret; + + ret = aio_ring_empty(evs->ioctx) ? 0 : POLLIN; + + return ret; +} + +static int release(struct pfs_aio *evs) +{ + put_ioctx(evs->ioctx); + + kfree(evs); + + return 0; +} + +static const struct pfs_operations aio_ops = { + .read = PFS_READ(read, struct pfs_aio, struct io_event), + .write = PFS_WRITE(write, struct pfs_aio, struct iocb), + .poll = PFS_POLL(poll, struct pfs_aio), + .release = PFS_RELEASE(release, struct pfs_aio), + .rsize = sizeof(struct io_event), + .wsize = sizeof(struct iocb), +}; + +asmlinkage long sys_plaio(aio_context_t ctx) +{ + long error; + struct pfs_aio *evs; + struct kioctx *ioctx = lookup_ioctx(ctx); + + if (!ioctx) + return -EINVAL; + + evs = kzalloc(sizeof(*evs), GFP_KERNEL); + if (!evs) { + put_ioctx(ioctx); + return -ENOMEM; + } + + evs->ioctx = ioctx; + + evs->file.data = evs; + evs->file.fops = &aio_ops; + evs->file.wait = &ioctx->wait; + + error = pfs_open(&evs->file); + + if (error < 0) + release(evs); + + return error; +} Index: linux-2.6/init/Kconfig =================================================================== --- linux-2.6.orig/init/Kconfig +++ linux-2.6/init/Kconfig @@ -490,6 +490,13 @@ config POLLFS_FUTEX help Pollable futex support +config POLLFS_AIO + bool "Enable pollfs aio" if EMBEDDED + default y + depends on POLLFS + help + Pollable aio support + config SHMEM bool "Use full shmem filesystem" if EMBEDDED default y -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/