remove-plugging-from-ext4-file-write-iter

   1 ext4: remove plugging from ext4_file_write_iter()
   2
   3 From: Jan Kara <jack@suse.cz>
   4
   5 do_blockdev_direct_IO() takes care of properly plugging direct IO so
   6 there's no need to plug again inside ext4_file_write_iter().
   7
   8 Signed-off-by: Jan Kara <jack@suse.cz>
   9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10 ---
  11  fs/ext4/file.c | 4 ----
  12  1 file changed, 4 deletions(-)
  13
  14 diff --git a/fs/ext4/file.c b/fs/ext4/file.c
  15 index 7e110c1a649d..9c9b7ed08d3c 100644
  16 --- a/fs/ext4/file.c
  17 +++ b/fs/ext4/file.c
  18 @@ -92,7 +92,6 @@ static ssize_t
  19  ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
  20  {
  21         struct inode *inode = file_inode(iocb->ki_filp);
  22 -       struct blk_plug plug;
  23         int o_direct = iocb->ki_flags & IOCB_DIRECT;
  24         int unaligned_aio = 0;
  25         int overwrite = 0;
  26 @@ -133,7 +132,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
  27         if (o_direct) {
  28                 size_t length = iov_iter_count(from);
  29                 loff_t pos = iocb->ki_pos;
  30 -               blk_start_plug(&plug);
  31
  32                 /* check whether we do a DIO overwrite or not */
  33                 if (ext4_should_dioread_nolock(inode) && !unaligned_aio &&
  34 @@ -170,8 +168,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
  35
  36         if (ret > 0)
  37                 ret = generic_write_sync(iocb, ret);
  38 -       if (o_direct)
  39 -               blk_finish_plug(&plug);
  40
  41         return ret;
  42
  43 --
  44 2.6.6
  45
  46