Commit 91b94c5d authored by Al Viro's avatar Al Viro
Browse files

iocb: delay evaluation of IS_SYNC(...) until we want to check IOCB_DSYNC 



New helper to be used instead of direct checks for IOCB_DSYNC:
iocb_is_dsync(iocb).  Checks converted, which allows to avoid
the IS_SYNC(iocb->ki_filp->f_mapping->host) part (4 cache lines)
from iocb_flags() - it's checked in iocb_is_dsync() instead

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

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static unsigned int dio_bio_write_op(struct kiocb *iocb) 
	unsigned int op = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;



	/* avoid the need for a I/O completion work item */

	if (iocb->ki_flags & IOCB_DSYNC)

	if (iocb_is_dsync(iocb))

		op |= REQ_FUA;

	return op;

}

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from, 
	struct file *file = iocb->ki_filp;

	struct btrfs_inode *inode = BTRFS_I(file_inode(file));

	ssize_t num_written, num_sync;

	const bool sync = iocb->ki_flags & IOCB_DSYNC;

	const bool sync = iocb_is_dsync(iocb);



	/*

	 * If the fs flips readonly due to some impossible error, although we

fs/direct-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, 
	 */

	if (dio->is_async && iov_iter_rw(iter) == WRITE) {

		retval = 0;

		if (iocb->ki_flags & IOCB_DSYNC)

		if (iocb_is_dsync(iocb))

			retval = dio_set_defer_completion(dio);

		else if (!dio->inode->i_sb->s_dio_done_wq) {

			/*

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static unsigned int fuse_write_flags(struct kiocb *iocb) 
{

	unsigned int flags = iocb->ki_filp->f_flags;



	if (iocb->ki_flags & IOCB_DSYNC)

	if (iocb_is_dsync(iocb))

		flags |= O_DSYNC;

	if (iocb->ki_flags & IOCB_SYNC)

		flags |= O_SYNC;

fs/iomap/direct-io.c

+1 −2
Original line number Diff line number Diff line
@@ -548,8 +548,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, 
		}



		/* for data sync or sync, we need sync completion processing */

		if (iocb->ki_flags & IOCB_DSYNC &&

		    !(dio_flags & IOMAP_DIO_NOSYNC)) {

		if (iocb_is_dsync(iocb) && !(dio_flags & IOMAP_DIO_NOSYNC)) {

			dio->flags |= IOMAP_DIO_NEED_SYNC;



		       /*