1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 804000183c5..32814e8800e 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -66,19 +66,26 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
         return 0;
 }
 
-int fb_deferred_io_fsync(struct file *file, int datasync)
+int fb_deferred_io_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct fb_info *info = file->private_data;
+        struct inode *inode = file->f_path.dentry->d_inode;
+        int err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        if (err)
+                return err;
 
         /* Skip if deferred io is compiled-in but disabled on this fbdev */
         if (!info->fbdefio)
                 return 0;
 
+        mutex_lock(&inode->i_mutex);
         /* Kill off the delayed work */
         cancel_delayed_work_sync(&info->deferred_work);
 
         /* Run it immediately */
-        return schedule_delayed_work(&info->deferred_work, 0);
+        err = schedule_delayed_work(&info->deferred_work, 0);
+        mutex_unlock(&inode->i_mutex);
+        return err;
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_fsync);