mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-23 07:34:31 +00:00
dax: fix O_DIRECT I/O to the last block of a blockdev
commit bbab37ddc2
(block: Add support for DAX reads/writes to
block devices) caused a regression in mkfs.xfs. That utility
sets the block size of the device to the logical block size
using the BLKBSZSET ioctl, and then issues a single sector read
from the last sector of the device. This results in the dax_io
code trying to do a page-sized read from 512 bytes from the end
of the device. The result is -ERANGE being returned to userspace.
The fix is to align the block to the page size before calling
get_block.
Thanks to willy for simplifying my original patch.
Cc: <stable@vger.kernel.org>
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Tested-by: Linda Knippers <linda.knippers@hp.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
6ff33f3902
commit
e94f5a2285
1 changed files with 2 additions and 1 deletions
3
fs/dax.c
3
fs/dax.c
|
@ -119,7 +119,8 @@ static ssize_t dax_io(struct inode *inode, struct iov_iter *iter,
|
||||||
size_t len;
|
size_t len;
|
||||||
if (pos == max) {
|
if (pos == max) {
|
||||||
unsigned blkbits = inode->i_blkbits;
|
unsigned blkbits = inode->i_blkbits;
|
||||||
sector_t block = pos >> blkbits;
|
long page = pos >> PAGE_SHIFT;
|
||||||
|
sector_t block = page << (PAGE_SHIFT - blkbits);
|
||||||
unsigned first = pos - (block << blkbits);
|
unsigned first = pos - (block << blkbits);
|
||||||
long size;
|
long size;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue