| Message ID | 20211109083309.584081-17-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/29] nvdimm/pmem: move dax_attribute_group from dax to pmem | expand |
On Tue, Nov 9, 2021 at 12:34 AM Christoph Hellwig <hch@lst.de> wrote: > > 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. Agree. Reviewed-by: Dan Williams <dan.j.williams@intel.com>
On Tue, Nov 09, 2021 at 09:32:56AM +0100, Christoph Hellwig wrote: > 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: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/dax.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fs/dax.c b/fs/dax.c > index 5364549d67a48..d7a923d152240 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -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(); > -- > 2.30.2 >
diff --git a/fs/dax.c b/fs/dax.c index 5364549d67a48..d7a923d152240 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -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();
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> --- fs/dax.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)