Commit a3c0d439 authored by Christoph Hellwig's avatar Christoph Hellwig

aio: implement IOCB_CMD_FSYNC and IOCB_CMD_FDSYNC

Simple workqueue offload for now, but prepared for adding a real aio_fsync
method if the need arises.  Based on an earlier patch from Dave Chinner.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 54843f87
...@@ -156,6 +156,12 @@ struct kioctx { ...@@ -156,6 +156,12 @@ struct kioctx {
unsigned id; unsigned id;
}; };
struct fsync_iocb {
struct work_struct work;
struct file *file;
bool datasync;
};
/* /*
* We use ki_cancel == KIOCB_CANCELLED to indicate that a kiocb has been either * We use ki_cancel == KIOCB_CANCELLED to indicate that a kiocb has been either
* cancelled or completed (this makes a certain amount of sense because * cancelled or completed (this makes a certain amount of sense because
...@@ -172,6 +178,7 @@ struct kioctx { ...@@ -172,6 +178,7 @@ struct kioctx {
struct aio_kiocb { struct aio_kiocb {
union { union {
struct kiocb rw; struct kiocb rw;
struct fsync_iocb fsync;
}; };
struct kioctx *ki_ctx; struct kioctx *ki_ctx;
...@@ -1573,6 +1580,36 @@ static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored, ...@@ -1573,6 +1580,36 @@ static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored,
return ret; return ret;
} }
static void aio_fsync_work(struct work_struct *work)
{
struct fsync_iocb *req = container_of(work, struct fsync_iocb, work);
int ret;
ret = vfs_fsync(req->file, req->datasync);
fput(req->file);
aio_complete(container_of(req, struct aio_kiocb, fsync), ret, 0);
}
static int aio_fsync(struct fsync_iocb *req, struct iocb *iocb, bool datasync)
{
if (unlikely(iocb->aio_buf || iocb->aio_offset || iocb->aio_nbytes ||
iocb->aio_rw_flags))
return -EINVAL;
req->file = fget(iocb->aio_fildes);
if (unlikely(!req->file))
return -EBADF;
if (unlikely(!req->file->f_op->fsync)) {
fput(req->file);
return -EINVAL;
}
req->datasync = datasync;
INIT_WORK(&req->work, aio_fsync_work);
schedule_work(&req->work);
return -EIOCBQUEUED;
}
static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
struct iocb *iocb, bool compat) struct iocb *iocb, bool compat)
{ {
...@@ -1636,6 +1673,12 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, ...@@ -1636,6 +1673,12 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
case IOCB_CMD_PWRITEV: case IOCB_CMD_PWRITEV:
ret = aio_write(&req->rw, iocb, true, compat); ret = aio_write(&req->rw, iocb, true, compat);
break; break;
case IOCB_CMD_FSYNC:
ret = aio_fsync(&req->fsync, iocb, false);
break;
case IOCB_CMD_FDSYNC:
ret = aio_fsync(&req->fsync, iocb, true);
break;
default: default:
pr_debug("invalid aio operation %d\n", iocb->aio_lio_opcode); pr_debug("invalid aio operation %d\n", iocb->aio_lio_opcode);
ret = -EINVAL; ret = -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment