Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm: move vmtruncate_range to truncate.c

You would expect to find vmtruncate_range() next to vmtruncate() in
mm/truncate.c: move it there.

Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Hugh Dickins and committed by
Linus Torvalds
5b8ba101 4d258b25

+24 -24
-24
mm/memory.c
··· 2798 2798 } 2799 2799 EXPORT_SYMBOL(unmap_mapping_range); 2800 2800 2801 - int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end) 2802 - { 2803 - struct address_space *mapping = inode->i_mapping; 2804 - 2805 - /* 2806 - * If the underlying filesystem is not going to provide 2807 - * a way to truncate a range of blocks (punch a hole) - 2808 - * we should return failure right now. 2809 - */ 2810 - if (!inode->i_op->truncate_range) 2811 - return -ENOSYS; 2812 - 2813 - mutex_lock(&inode->i_mutex); 2814 - down_write(&inode->i_alloc_sem); 2815 - unmap_mapping_range(mapping, offset, (end - offset), 1); 2816 - truncate_inode_pages_range(mapping, offset, end); 2817 - unmap_mapping_range(mapping, offset, (end - offset), 1); 2818 - inode->i_op->truncate_range(inode, offset, end); 2819 - up_write(&inode->i_alloc_sem); 2820 - mutex_unlock(&inode->i_mutex); 2821 - 2822 - return 0; 2823 - } 2824 - 2825 2801 /* 2826 2802 * We enter with non-exclusive mmap_sem (to exclude vma changes, 2827 2803 * but allow concurrent faults), and pte mapped but not yet locked.
+24
mm/truncate.c
··· 603 603 return 0; 604 604 } 605 605 EXPORT_SYMBOL(vmtruncate); 606 + 607 + int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end) 608 + { 609 + struct address_space *mapping = inode->i_mapping; 610 + 611 + /* 612 + * If the underlying filesystem is not going to provide 613 + * a way to truncate a range of blocks (punch a hole) - 614 + * we should return failure right now. 615 + */ 616 + if (!inode->i_op->truncate_range) 617 + return -ENOSYS; 618 + 619 + mutex_lock(&inode->i_mutex); 620 + down_write(&inode->i_alloc_sem); 621 + unmap_mapping_range(mapping, offset, (end - offset), 1); 622 + truncate_inode_pages_range(mapping, offset, end); 623 + unmap_mapping_range(mapping, offset, (end - offset), 1); 624 + inode->i_op->truncate_range(inode, offset, end); 625 + up_write(&inode->i_alloc_sem); 626 + mutex_unlock(&inode->i_mutex); 627 + 628 + return 0; 629 + }