diff options
Diffstat (limited to 'fs/dax.c')
-rw-r--r-- | fs/dax.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -75,13 +75,13 @@ static long dax_map_atomic(struct block_device *bdev, struct blk_dax_ctl *dax) | |||
75 | struct request_queue *q = bdev->bd_queue; | 75 | struct request_queue *q = bdev->bd_queue; |
76 | long rc = -EIO; | 76 | long rc = -EIO; |
77 | 77 | ||
78 | dax->addr = (void __pmem *) ERR_PTR(-EIO); | 78 | dax->addr = ERR_PTR(-EIO); |
79 | if (blk_queue_enter(q, true) != 0) | 79 | if (blk_queue_enter(q, true) != 0) |
80 | return rc; | 80 | return rc; |
81 | 81 | ||
82 | rc = bdev_direct_access(bdev, dax); | 82 | rc = bdev_direct_access(bdev, dax); |
83 | if (rc < 0) { | 83 | if (rc < 0) { |
84 | dax->addr = (void __pmem *) ERR_PTR(rc); | 84 | dax->addr = ERR_PTR(rc); |
85 | blk_queue_exit(q); | 85 | blk_queue_exit(q); |
86 | return rc; | 86 | return rc; |
87 | } | 87 | } |
@@ -152,7 +152,7 @@ static ssize_t dax_io(struct inode *inode, struct iov_iter *iter, | |||
152 | int rw = iov_iter_rw(iter), rc; | 152 | int rw = iov_iter_rw(iter), rc; |
153 | long map_len = 0; | 153 | long map_len = 0; |
154 | struct blk_dax_ctl dax = { | 154 | struct blk_dax_ctl dax = { |
155 | .addr = (void __pmem *) ERR_PTR(-EIO), | 155 | .addr = ERR_PTR(-EIO), |
156 | }; | 156 | }; |
157 | unsigned blkbits = inode->i_blkbits; | 157 | unsigned blkbits = inode->i_blkbits; |
158 | sector_t file_blks = (i_size_read(inode) + (1 << blkbits) - 1) | 158 | sector_t file_blks = (i_size_read(inode) + (1 << blkbits) - 1) |