Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / block / partition-generic.c

diff --git a/block/partition-generic.c b/block/partition-generic.c
index 0171a2faad6814754a42ed29ec001e9aacdc844d..ff07b9143ca456f8b2e8aaa3f41f9d6d8b5fe7a3 100644 (file)
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -16,7 +16,6 @@
 #include <linux/kmod.h>
 #include <linux/ctype.h>
 #include <linux/genhd.h>
-#include <linux/dax.h>
 #include <linux/blktrace_api.h>
 
 #include "partitions/check.h"
@@ -630,24 +629,12 @@ int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
        return 0;
 }
 
-static struct page *read_pagecache_sector(struct block_device *bdev, sector_t n)
-{
-       struct address_space *mapping = bdev->bd_inode->i_mapping;
-
-       return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_SHIFT-9)),
-                                NULL);
-}
-
 unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
 {
+       struct address_space *mapping = bdev->bd_inode->i_mapping;
        struct page *page;
 
-       /* don't populate page cache for dax capable devices */
-       if (IS_DAX(bdev->bd_inode))
-               page = read_dax_sector(bdev, n);
-       else
-               page = read_pagecache_sector(bdev, n);
-
+       page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_SHIFT-9)), NULL);
        if (!IS_ERR(page)) {
                if (PageError(page))
                        goto fail;