ext4: remove plugging from ext4_file_write_iter()
authorJan Kara <jack@suse.cz>
Fri, 30 Sep 2016 05:57:41 +0000 (01:57 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 30 Sep 2016 05:57:41 +0000 (01:57 -0400)
do_blockdev_direct_IO() takes care of properly plugging direct IO so
there's no need to plug again inside ext4_file_write_iter().

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/file.c

index 25342c8dd5d6dde084f02298e47be5aa9e3291d6..25f763f2201a4a48f14f5a18c1233e309f80aa4a 100644 (file)
@@ -92,7 +92,6 @@ static ssize_t
 ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
        struct inode *inode = file_inode(iocb->ki_filp);
-       struct blk_plug plug;
        int o_direct = iocb->ki_flags & IOCB_DIRECT;
        int unaligned_aio = 0;
        int overwrite = 0;
@@ -133,7 +132,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (o_direct) {
                size_t length = iov_iter_count(from);
                loff_t pos = iocb->ki_pos;
-               blk_start_plug(&plug);
 
                /* check whether we do a DIO overwrite or not */
                if (ext4_should_dioread_nolock(inode) && !unaligned_aio &&
@@ -169,8 +167,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 
        if (ret > 0)
                ret = generic_write_sync(iocb, ret);
-       if (o_direct)
-               blk_finish_plug(&plug);
 
        return ret;