userfaultfd: non-cooperative: flush event_wqh at release time

[sfrench/cifs-2.6.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index a7df151f8aba8ba1447ff4094192754fbea76426..9941dc8342dfd7671eb96ad27a736d5220d670c8 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -632,7 +632,7 @@ int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
        struct block_device *bdev = I_BDEV(bd_inode);
        int error;
        
-       error = filemap_write_and_wait_range(filp->f_mapping, start, end);
+       error = file_write_and_wait_range(filp, start, end);
        if (error)
                return error;
 
@@ -1751,6 +1751,7 @@ static int blkdev_open(struct inode * inode, struct file * filp)
                return -ENOMEM;
 
        filp->f_mapping = bdev->bd_inode->i_mapping;
+       filp->f_wb_err = filemap_sample_wb_err(filp->f_mapping);
 
        return blkdev_get(bdev, filp->f_mode, filp);
 }