x86/smpboot: Init apic mapping before usage

[cascardo/linux.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index ed2397f..755119c 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -225,7 +225,8 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode,
                unsigned long arg)
 {
        uint64_t range[2];
-       uint64_t start, len;
+       struct address_space *mapping;
+       uint64_t start, end, len;
 
        if (!(mode & FMODE_WRITE))
                return -EBADF;
@@ -235,18 +236,23 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode,
 
        start = range[0];
        len = range[1];
+       end = start + len - 1;
 
        if (start & 511)
                return -EINVAL;
        if (len & 511)
                return -EINVAL;
-       start >>= 9;
-       len >>= 9;
-
-       if (start + len > (i_size_read(bdev->bd_inode) >> 9))
+       if (end >= (uint64_t)i_size_read(bdev->bd_inode))
+               return -EINVAL;
+       if (end < start)
                return -EINVAL;
 
-       return blkdev_issue_zeroout(bdev, start, len, GFP_KERNEL, false);
+       /* Invalidate the page cache, including dirty pages */
+       mapping = bdev->bd_inode->i_mapping;
+       truncate_inode_pages_range(mapping, start, end);
+
+       return blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL,
+                                   false);
 }
 
 static int put_ushort(unsigned long arg, unsigned short val)