mm/mmu_notifier: use structure for invalidate_range_start/end calls v2

To avoid having to change many call sites everytime we want to add a
parameter use a structure to group all parameters for the mmu_notifier
invalidate_range_start/end cakks.  No functional changes with this patch.

[akpm@linux-foundation.org: coding style fixes]
Link: http://lkml.kernel.org/r/20181205053628.3210-3-jglisse@redhat.com
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Felix Kuehling <felix.kuehling@amd.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
From: Jérôme Glisse <jglisse@redhat.com>
Subject: mm/mmu_notifier: use structure for invalidate_range_start/end calls v3

fix build warning in migrate.c when CONFIG_MMU_NOTIFIER=n

Link: http://lkml.kernel.org/r/20181213171330.8489-3-jglisse@redhat.com
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 10 insertions, 5 deletions

diff --git a/fs/dax.c b/fs/dax.c
index 48132eca3761..262e14f29933 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -779,7 +779,8 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
 
         i_mmap_lock_read(mapping);
         vma_interval_tree_foreach(vma, &mapping->i_mmap, index, index) {
-                unsigned long address, start, end;
+                struct mmu_notifier_range range;
+                unsigned long address;
 
                 cond_resched();
 
@@ -793,7 +794,8 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
                  * call mmu_notifier_invalidate_range_start() on our behalf
                  * before taking any lock.
                  */
-                if (follow_pte_pmd(vma->vm_mm, address, &start, &end, &ptep, &pmdp, &ptl))
+                if (follow_pte_pmd(vma->vm_mm, address, &range,
+                                   &ptep, &pmdp, &ptl))
                         continue;
 
                 /*
@@ -835,7 +837,7 @@ unlock_pte:
                         pte_unmap_unlock(ptep, ptl);
                 }
 
-                mmu_notifier_invalidate_range_end(vma->vm_mm, start, end);
+                mmu_notifier_invalidate_range_end(&range);
         }
         i_mmap_unlock_read(mapping);
 }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 47c3764c469b..b3ddceb003bc 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1096,6 +1096,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                 return -ESRCH;
         mm = get_task_mm(task);
         if (mm) {
+                struct mmu_notifier_range range;
                 struct clear_refs_private cp = {
                         .type = type,
                 };
@@ -1139,11 +1140,13 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                                 downgrade_write(&mm->mmap_sem);
                                 break;
                         }
-                        mmu_notifier_invalidate_range_start(mm, 0, -1);
+
+                        mmu_notifier_range_init(&range, mm, 0, -1UL);
+                        mmu_notifier_invalidate_range_start(&range);
                 }
                 walk_page_range(0, mm->highest_vm_end, &clear_refs_walk);
                 if (type == CLEAR_REFS_SOFT_DIRTY)
-                        mmu_notifier_invalidate_range_end(mm, 0, -1);
+                        mmu_notifier_invalidate_range_end(&range);
                 tlb_finish_mmu(&tlb, 0, -1);
                 up_read(&mm->mmap_sem);
 out_mm: