Skip to content

block: skip redundant flush for O_DSYNC direct writes #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blktests-ci-kpd wants to merge 1 commit into from
Closed

block: skip redundant flush for O_DSYNC direct writes #1130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions block/fops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
bool atomic = iocb->ki_flags & IOCB_ATOMIC;
loff_t size = bdev_nr_bytes(bdev);
size_t shorted = 0;
bool dio_fua_done = false;
ssize_t ret;

if (bdev_read_only(bdev))
Expand Down Expand Up @@ -765,9 +766,13 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)

if (iocb->ki_flags & IOCB_DIRECT) {
ret = blkdev_direct_write(iocb, from);
if (ret >= 0 && iov_iter_count(from))
if (ret >= 0 && iov_iter_count(from)) {
ret = direct_write_fallback(iocb, from, ret,
blkdev_buffered_write(iocb, from));
} else if (ret > 0 && iocb_is_dsync(iocb)) {
/* FUA from dio_bio_write_op() already made it durable */
dio_fua_done = true;
}
} else {
/*
* Take i_rwsem and invalidate_lock to avoid racing with
Expand All @@ -779,7 +784,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
inode_unlock_shared(bd_inode);
}

if (ret > 0)
if (ret > 0 && !dio_fua_done)
ret = generic_write_sync(iocb, ret);
iov_iter_reexpand(from, iov_iter_count(from) + shorted);
return ret;
Expand Down
Loading