Skip to content

Commit 727cfe9

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: open code __generic_file_write_iter for blkdev writes
Open code __generic_file_write_iter to remove the indirect call into ->direct_IO and to prepare using the iomap based write code. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Christian Brauner <brauner@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Link: https://lore.kernel.org/r/20230801172201.1923299-4-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 2ba39cc commit 727cfe9

File tree

1 file changed

+43
-2
lines changed

1 file changed

+43
-2
lines changed

block/fops.c

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,30 @@ static int blkdev_release(struct inode *inode, struct file *filp)
533533
return 0;
534534
}
535535

536+
static ssize_t
537+
blkdev_direct_write(struct kiocb *iocb, struct iov_iter *from)
538+
{
539+
size_t count = iov_iter_count(from);
540+
ssize_t written;
541+
542+
written = kiocb_invalidate_pages(iocb, count);
543+
if (written) {
544+
if (written == -EBUSY)
545+
return 0;
546+
return written;
547+
}
548+
549+
written = blkdev_direct_IO(iocb, from);
550+
if (written > 0) {
551+
kiocb_invalidate_post_direct_write(iocb, count);
552+
iocb->ki_pos += written;
553+
count -= written;
554+
}
555+
if (written != -EIOCBQUEUED)
556+
iov_iter_revert(from, count - iov_iter_count(from));
557+
return written;
558+
}
559+
536560
/*
537561
* Write data to the block device. Only intended for the block device itself
538562
* and the raw driver which basically is a fake block device.
@@ -542,7 +566,8 @@ static int blkdev_release(struct inode *inode, struct file *filp)
542566
*/
543567
static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
544568
{
545-
struct block_device *bdev = I_BDEV(iocb->ki_filp->f_mapping->host);
569+
struct file *file = iocb->ki_filp;
570+
struct block_device *bdev = I_BDEV(file->f_mapping->host);
546571
struct inode *bd_inode = bdev->bd_inode;
547572
loff_t size = bdev_nr_bytes(bdev);
548573
size_t shorted = 0;
@@ -569,7 +594,23 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
569594
iov_iter_truncate(from, size);
570595
}
571596

572-
ret = __generic_file_write_iter(iocb, from);
597+
ret = file_remove_privs(file);
598+
if (ret)
599+
return ret;
600+
601+
ret = file_update_time(file);
602+
if (ret)
603+
return ret;
604+
605+
if (iocb->ki_flags & IOCB_DIRECT) {
606+
ret = blkdev_direct_write(iocb, from);
607+
if (ret >= 0 && iov_iter_count(from))
608+
ret = direct_write_fallback(iocb, from, ret,
609+
generic_perform_write(iocb, from));
610+
} else {
611+
ret = generic_perform_write(iocb, from);
612+
}
613+
573614
if (ret > 0)
574615
ret = generic_write_sync(iocb, ret);
575616
iov_iter_reexpand(from, iov_iter_count(from) + shorted);

0 commit comments

Comments
 (0)