gfs2: Add wrapper for iomap_file_buffered_write

commit 2eb7509a05443048fb4df60b782de3f03c6c298b upstream

Add a wrapper around iomap_file_buffered_write.  We'll add code for when
the operation needs to be retried here later.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 1c8b747..df55042 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -877,6 +877,20 @@ out_uninit:
        return written ? written : ret;
 }
 
+static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, struct iov_iter *from)
+{
+       struct file *file = iocb->ki_filp;
+       struct inode *inode = file_inode(file);
+       ssize_t ret;
+
+       current->backing_dev_info = inode_to_bdi(inode);
+       ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
+       current->backing_dev_info = NULL;
+       if (ret > 0)
+               iocb->ki_pos += ret;
+       return ret;
+}
+
 /**
  * gfs2_file_write_iter - Perform a write to a file
  * @iocb: The io context
@@ -928,9 +942,7 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                        goto out_unlock;
 
                iocb->ki_flags |= IOCB_DSYNC;
-               current->backing_dev_info = inode_to_bdi(inode);
-               buffered = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
-               current->backing_dev_info = NULL;
+               buffered = gfs2_file_buffered_write(iocb, from);
                if (unlikely(buffered <= 0)) {
                        if (!ret)
                                ret = buffered;
@@ -944,7 +956,6 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 * the direct I/O range as we don't know if the buffered pages
                 * made it to disk.
                 */
-               iocb->ki_pos += buffered;
                ret2 = generic_write_sync(iocb, buffered);
                invalidate_mapping_pages(mapping,
                                (iocb->ki_pos - buffered) >> PAGE_SHIFT,
@@ -952,13 +963,9 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                if (!ret || ret2 > 0)
                        ret += ret2;
        } else {
-               current->backing_dev_info = inode_to_bdi(inode);
-               ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
-               current->backing_dev_info = NULL;
-               if (likely(ret > 0)) {
-                       iocb->ki_pos += ret;
+               ret = gfs2_file_buffered_write(iocb, from);
+               if (likely(ret > 0))
                        ret = generic_write_sync(iocb, ret);
-               }
        }
 
 out_unlock: