]> www.infradead.org Git - users/hch/block.git/commitdiff
block: don't plug in blkdev_write_iter
authorChristoph Hellwig <hch@lst.de>
Sat, 22 Apr 2023 10:08:50 +0000 (12:08 +0200)
committerChristoph Hellwig <hch@lst.de>
Sat, 22 Apr 2023 13:14:52 +0000 (15:14 +0200)
Remove the no needed plug in blkdev_write_iter.  For direct I/O that
issues more than a single I/O, the plug is already done in
__blkdev_direct_IO, and for synchronous buffered writes, the plug
is done in writeback_inodes_wb / wb_writeback, while for the other
cases a plug doesn't make sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
block/fops.c

index d2e6be4e3d1c7da029d0a38bd18cf9b069f901e2..102ee85fc6eedf467e064b76d7e4c7ffc931140a 100644 (file)
@@ -520,7 +520,6 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
        struct block_device *bdev = iocb->ki_filp->private_data;
        struct inode *bd_inode = bdev->bd_inode;
        loff_t size = bdev_nr_bytes(bdev);
-       struct blk_plug plug;
        size_t shorted = 0;
        ssize_t ret;
 
@@ -545,12 +544,10 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
                iov_iter_truncate(from, size);
        }
 
-       blk_start_plug(&plug);
        ret = __generic_file_write_iter(iocb, from);
        if (ret > 0)
                ret = generic_write_sync(iocb, ret);
        iov_iter_reexpand(from, iov_iter_count(from) + shorted);
-       blk_finish_plug(&plug);
        return ret;
 }