nbd: Respect max_part for all partition scans

[linux-2.6-microblaze.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 9bd3298..4d88fe5 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2272,7 +2272,7 @@ static void __vunmap(const void *addr, int deallocate_pages)
        debug_check_no_locks_freed(area->addr, get_vm_area_size(area));
        debug_check_no_obj_freed(area->addr, get_vm_area_size(area));
 
-       kasan_poison_vmalloc(area->addr, area->size);
+       kasan_poison_vmalloc(area->addr, get_vm_area_size(area));
 
        vm_remove_mappings(area, deallocate_pages);
 
@@ -2291,7 +2291,6 @@ static void __vunmap(const void *addr, int deallocate_pages)
        }
 
        kfree(area);
-       return;
 }
 
 static inline void __vfree_deferred(const void *addr)
@@ -3151,6 +3150,7 @@ pvm_find_va_enclose_addr(unsigned long addr)
  * @va:
  *   in - the VA we start the search(reverse order);
  *   out - the VA with the highest aligned end address.
+ * @align: alignment for required highest address
  *
  * Returns: determined end address within vmap_area
  */
@@ -3465,11 +3465,11 @@ static void *s_next(struct seq_file *m, void *p, loff_t *pos)
 }
 
 static void s_stop(struct seq_file *m, void *p)
-       __releases(&vmap_purge_lock)
        __releases(&vmap_area_lock)
+       __releases(&vmap_purge_lock)
 {
-       mutex_unlock(&vmap_purge_lock);
        spin_unlock(&vmap_area_lock);
+       mutex_unlock(&vmap_purge_lock);
 }
 
 static void show_numa_info(struct seq_file *m, struct vm_struct *v)