inline-generic_file_aio_write

   1 ext4: inline generic_file_aio_write() into ext4_file_write()
   2
   3 Copy generic_file_aio_write() into ext4_file_write().  This is part of
   4 a patch series which allows us to simplify ext4_file_write() and
   5 ext4_file_dio_write(), by calling __generic_file_aio_write() directly.
   6
   7 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
   8 Reviewed-by: Jan Kara <jack@suse.cz>
   9 ---
  10  fs/ext4/file.c | 20 ++++++++++++++++----
  11  1 file changed, 16 insertions(+), 4 deletions(-)
  12
  13 diff --git a/fs/ext4/file.c b/fs/ext4/file.c
  14 index bf0e772..79b77a5 100644
  15 --- a/fs/ext4/file.c
  16 +++ b/fs/ext4/file.c
  17 @@ -113,8 +113,6 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
  18                 ext4_unwritten_wait(inode);
  19         }
  20
  21 -       BUG_ON(iocb->ki_pos != pos);
  22 -
  23         mutex_lock(&inode->i_mutex);
  24         blk_start_plug(&plug);
  25
  26 @@ -168,9 +166,12 @@ static ssize_t
  27  ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
  28                 unsigned long nr_segs, loff_t pos)
  29  {
  30 +       struct file *file = iocb->ki_filp;
  31         struct inode *inode = file_inode(iocb->ki_filp);
  32         ssize_t ret;
  33
  34 +       BUG_ON(iocb->ki_pos != pos);
  35 +
  36         /*
  37          * If we have encountered a bitmap-format file, the size limit
  38          * is smaller than s_maxbytes, which is for extent-mapped files.
  39 @@ -192,8 +193,19 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
  40
  41         if (unlikely(iocb->ki_filp->f_flags & O_DIRECT))
  42                 ret = ext4_file_dio_write(iocb, iov, nr_segs, pos);
  43 -       else
  44 -               ret = generic_file_aio_write(iocb, iov, nr_segs, pos);
  45 +       else {
  46 +               mutex_lock(&inode->i_mutex);
  47 +               ret = __generic_file_aio_write(iocb, iov, nr_segs);
  48 +               mutex_unlock(&inode->i_mutex);
  49 +
  50 +               if (ret > 0) {
  51 +                       ssize_t err;
  52 +
  53 +                       err = generic_write_sync(file, iocb->ki_pos - ret, ret);
  54 +                       if (err < 0)
  55 +                               ret = err;
  56 +               }
  57 +       }
  58
  59         return ret;
  60  }