diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-11-29 11:21:50 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-12-04 08:58:52 -0800 |
| commit | 4a2d7d5950507a27e3074e4a29dc20720235f811 (patch) | |
| tree | 819e3197465e02a03317d6cb240e2ca448fcc678 /fs/dax.c | |
| parent | f1ba5fafba9bfde4b040cd0d14256aed25a35c5e (diff) | |
| download | linux-stable-4a2d7d5950507a27e3074e4a29dc20720235f811.tar.gz linux-stable-4a2d7d5950507a27e3074e4a29dc20720235f811.tar.bz2 linux-stable-4a2d7d5950507a27e3074e4a29dc20720235f811.zip | |
fsdax: simplify the offset check in dax_iomap_zero
The file relative offset must have the same alignment as the storage
offset, so use that and get rid of the call to iomap_sector.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20211129102203.2243509-17-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/dax.c')
| -rw-r--r-- | fs/dax.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1123,7 +1123,6 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf, s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) { - sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); long rc, id; void *kaddr; @@ -1131,8 +1130,7 @@ s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) unsigned offset = offset_in_page(pos); unsigned size = min_t(u64, PAGE_SIZE - offset, length); - if (IS_ALIGNED(sector << SECTOR_SHIFT, PAGE_SIZE) && - (size == PAGE_SIZE)) + if (IS_ALIGNED(pos, PAGE_SIZE) && size == PAGE_SIZE) page_aligned = true; id = dax_read_lock(); |