Commit 164f4064 authored by Al Viro's avatar Al Viro
Browse files

keep iocb_flags() result cached in struct file 



* calculate at the time we set FMODE_OPENED (do_dentry_open() for normal
opens, alloc_file() for pipe()/socket()/etc.)
* update when handling F_SETFL
* keep in a new field - file->f_iocb_flags; since that thing is needed only
before the refcount reaches zero, we can put it into the same anon union
where ->f_rcuhead and ->f_llist live - those are used only after refcount
reaches zero.

Reviewed-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 91b94c5d

drivers/nvme/target/io-cmd-file.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos, 


	iocb->ki_pos = pos;

	iocb->ki_filp = req->ns->file;

	iocb->ki_flags = ki_flags | iocb_flags(req->ns->file);

	iocb->ki_flags = ki_flags | iocb->ki_filp->f_iocb_flags;



	return call_iter(iocb, &iter);

}

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb) 
	req->ki_complete = aio_complete_rw;

	req->private = NULL;

	req->ki_pos = iocb->aio_offset;

	req->ki_flags = iocb_flags(req->ki_filp);

	req->ki_flags = req->ki_filp->f_iocb_flags;

	if (iocb->aio_flags & IOCB_FLAG_RESFD)

		req->ki_flags |= IOCB_EVENTFD;

	if (iocb->aio_flags & IOCB_FLAG_IOPRIO) {

fs/fcntl.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) 
	}

	spin_lock(&filp->f_lock);

	filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);

	filp->f_iocb_flags = iocb_flags(filp);

	spin_unlock(&filp->f_lock);



 out:

fs/file_table.c

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static struct file *alloc_file(const struct path *path, int flags, 
	if ((file->f_mode & FMODE_WRITE) &&

	     likely(fop->write || fop->write_iter))

		file->f_mode |= FMODE_CAN_WRITE;

	file->f_iocb_flags = iocb_flags(file);

	file->f_mode |= FMODE_OPENED;

	file->f_op = fop;

	if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

fs/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -4330,7 +4330,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode) 
	if (!io_req_ffs_set(req))

		req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;



	kiocb->ki_flags = iocb_flags(file);

	kiocb->ki_flags = file->f_iocb_flags;

	ret = kiocb_set_rw_flags(kiocb, req->rw.flags);

	if (unlikely(ret))

		return ret;