On 7/28/21 8:29 AM, Dan Williams wrote:

On Wed, Jul 14, 2021 at 12:36 PM Joao Martins [off-list ref] wrote:

quoted

Rather than calculating @pgoff manually, switch to ALIGN() instead.

Looks good,

Reviewed-by: Dan Williams <redacted>

Thanks!

quoted

Suggested-by: Dan Williams <redacted>
Signed-off-by: Joao Martins <redacted>
---
 drivers/dax/device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index dd8222a42808..0b82159b3564 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c

@@ -234,8 +234,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf,
                 * mapped. No need to consider the zero page, or racing
                 * conflicting mappings.
                 */
-               pgoff = linear_page_index(vmf->vma, vmf->address
-                               & ~(fault_size - 1));
+               pgoff = linear_page_index(vmf->vma,
+                               ALIGN(vmf->address, fault_size));
                for (i = 0; i < fault_size / PAGE_SIZE; i++) {
                        struct page *page;

--

2.17.1