Merge branch 'akpm' (patches from Andrew)

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

diff --git a/block/ioctl.c b/block/ioctl.c
index 4ff1f92..755119c 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -4,7 +4,6 @@
 #include <linux/gfp.h>
 #include <linux/blkpg.h>
 #include <linux/hdreg.h>
-#include <linux/badblocks.h>
 #include <linux/backing-dev.h>
 #include <linux/fs.h>
 #include <linux/blktrace_api.h>
@@ -226,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;
@@ -236,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;
+
+       /* 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, len, GFP_KERNEL, false);
+       return blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL,
+                                   false);
 }
 
 static int put_ushort(unsigned long arg, unsigned short val)
@@ -407,35 +412,6 @@ static inline int is_unrecognized_ioctl(int ret)
                ret == -ENOIOCTLCMD;
 }
 
-#ifdef CONFIG_FS_DAX
-bool blkdev_dax_capable(struct block_device *bdev)
-{
-       struct gendisk *disk = bdev->bd_disk;
-
-       if (!disk->fops->direct_access)
-               return false;
-
-       /*
-        * If the partition is not aligned on a page boundary, we can't
-        * do dax I/O to it.
-        */
-       if ((bdev->bd_part->start_sect % (PAGE_SIZE / 512))
-                       || (bdev->bd_part->nr_sects % (PAGE_SIZE / 512)))
-               return false;
-
-       /*
-        * If the device has known bad blocks, force all I/O through the
-        * driver / page cache.
-        *
-        * TODO: support finer grained dax error handling
-        */
-       if (disk->bb && disk->bb->count)
-               return false;
-
-       return true;
-}
-#endif
-
 static int blkdev_flushbuf(struct block_device *bdev, fmode_t mode,
                unsigned cmd, unsigned long arg)
 {
@@ -598,9 +574,6 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
        case BLKTRACESETUP:
        case BLKTRACETEARDOWN:
                return blk_trace_ioctl(bdev, cmd, argp);
-       case BLKDAXGET:
-               return put_int(arg, !!(bdev->bd_inode->i_flags & S_DAX));
-               break;
        case IOC_PR_REGISTER:
                return blkdev_pr_register(bdev, argp);
        case IOC_PR_RESERVE: