Commit 1d9e1288 authored by Bijan Mottahedeh's avatar Bijan Mottahedeh Committed by Jens Axboe
Browse files

io_uring: add io_statx structure 



Separate statx data from open in io_kiocb. No functional changes.

Signed-off-by: default avatarBijan Mottahedeh <bijan.mottahedeh@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0bf0eefd

fs/io_uring.c

+22 −16
Original line number Diff line number Diff line
@@ -425,11 +425,7 @@ struct io_sr_msg { 
struct io_open {

	struct file			*file;

	int				dfd;

	union {

		unsigned		mask;

	};

	struct filename			*filename;

	struct statx __user		*buffer;

	struct open_how			how;

	unsigned long			nofile;

};
@@ -481,6 +477,15 @@ struct io_provide_buf { 
	__u16				bid;

};



struct io_statx {

	struct file			*file;

	int				dfd;

	unsigned int			mask;

	unsigned int			flags;

	struct filename			*filename;

	struct statx __user		*buffer;

};



struct io_async_connect {

	struct sockaddr_storage		address;

};
@@ -622,6 +627,7 @@ struct io_kiocb { 
		struct io_epoll		epoll;

		struct io_splice	splice;

		struct io_provide_buf	pbuf;

		struct io_statx		statx;

	};



	struct io_async_ctx		*io;
@@ -3381,19 +3387,19 @@ static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;



	req->open.dfd = READ_ONCE(sqe->fd);

	req->open.mask = READ_ONCE(sqe->len);

	req->statx.dfd = READ_ONCE(sqe->fd);

	req->statx.mask = READ_ONCE(sqe->len);

	fname = u64_to_user_ptr(READ_ONCE(sqe->addr));

	req->open.buffer = u64_to_user_ptr(READ_ONCE(sqe->addr2));

	req->open.how.flags = READ_ONCE(sqe->statx_flags);

	req->statx.buffer = u64_to_user_ptr(READ_ONCE(sqe->addr2));

	req->statx.flags = READ_ONCE(sqe->statx_flags);



	if (vfs_stat_set_lookup_flags(&lookup_flags, req->open.how.flags))

	if (vfs_stat_set_lookup_flags(&lookup_flags, req->statx.flags))

		return -EINVAL;



	req->open.filename = getname_flags(fname, lookup_flags, NULL);

	if (IS_ERR(req->open.filename)) {

		ret = PTR_ERR(req->open.filename);

		req->open.filename = NULL;

	req->statx.filename = getname_flags(fname, lookup_flags, NULL);

	if (IS_ERR(req->statx.filename)) {

		ret = PTR_ERR(req->statx.filename);

		req->statx.filename = NULL;

		return ret;

	}
@@ -3403,7 +3409,7 @@ static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


static int io_statx(struct io_kiocb *req, bool force_nonblock)

{

	struct io_open *ctx = &req->open;

	struct io_statx *ctx = &req->statx;

	unsigned lookup_flags;

	struct path path;

	struct kstat stat;
@@ -3416,7 +3422,7 @@ static int io_statx(struct io_kiocb *req, bool force_nonblock) 
		return -EAGAIN;

	}



	if (vfs_stat_set_lookup_flags(&lookup_flags, ctx->how.flags))

	if (vfs_stat_set_lookup_flags(&lookup_flags, ctx->flags))

		return -EINVAL;



retry:
@@ -3428,7 +3434,7 @@ static int io_statx(struct io_kiocb *req, bool force_nonblock) 
	if (ret)

		goto err;



	ret = vfs_getattr(&path, &stat, ctx->mask, ctx->how.flags);

	ret = vfs_getattr(&path, &stat, ctx->mask, ctx->flags);

	path_put(&path);

	if (retry_estale(ret, lookup_flags)) {

		lookup_flags |= LOOKUP_REVAL;