From: Andrew Morton - Fix overflows - fiddle with coding style Signed-off-by: Badari Pulavarty Cc: Hugh Dickins Cc: Andrea Arcangeli Signed-off-by: Andrew Morton --- mm/madvise.c | 11 +++++------ mm/memory.c | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) diff -puN mm/madvise.c~madvise-remove-remove-pages-from-tmpfs-shm-backing-store-tidy mm/madvise.c --- devel/mm/madvise.c~madvise-remove-remove-pages-from-tmpfs-shm-backing-store-tidy 2005-11-11 16:27:11.000000000 -0800 +++ devel-akpm/mm/madvise.c 2005-11-11 16:27:11.000000000 -0800 @@ -147,8 +147,8 @@ static long madvise_dontneed(struct vm_a * NOTE: Currently, only shmfs/tmpfs is supported for this operation. * Other filesystems return -ENOSYS. */ -static long madvise_remove(struct vm_area_struct * vma, - unsigned long start, unsigned long end) +static long madvise_remove(struct vm_area_struct *vma, + unsigned long start, unsigned long end) { struct address_space *mapping; loff_t offset, endoff; @@ -162,14 +162,13 @@ static long madvise_remove(struct vm_are } mapping = vma->vm_file->f_mapping; - if (mapping == &swapper_space) { + if (mapping == &swapper_space) return -EINVAL; - } offset = (loff_t)(start - vma->vm_start) - + (vma->vm_pgoff << PAGE_SHIFT); + + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); endoff = (loff_t)(end - vma->vm_start - 1) - + (vma->vm_pgoff << PAGE_SHIFT); + + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); return vmtruncate_range(mapping->host, offset, endoff); } diff -puN mm/memory.c~madvise-remove-remove-pages-from-tmpfs-shm-backing-store-tidy mm/memory.c --- devel/mm/memory.c~madvise-remove-remove-pages-from-tmpfs-shm-backing-store-tidy 2005-11-11 16:27:11.000000000 -0800 +++ devel-akpm/mm/memory.c 2005-11-11 16:34:31.000000000 -0800 @@ -1608,10 +1608,9 @@ out_big: out_busy: return -ETXTBSY; } - EXPORT_SYMBOL(vmtruncate); -int vmtruncate_range(struct inode * inode, loff_t offset, loff_t end) +int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end) { struct address_space *mapping = inode->i_mapping; @@ -1623,7 +1622,6 @@ int vmtruncate_range(struct inode * inod if (!inode->i_op || !inode->i_op->truncate_range) return -ENOSYS; - /* XXX - Do we need both i_sem and i_allocsem all the way ? */ down(&inode->i_sem); down_write(&inode->i_alloc_sem); unmap_mapping_range(mapping, offset, (end - offset), 1); @@ -1634,7 +1632,6 @@ int vmtruncate_range(struct inode * inod return 0; } - EXPORT_SYMBOL(vmtruncate_range); /* _