diff options
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 0a0ab8e21b1..c5bc355d824 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -397,17 +397,16 @@ static void hugetlbfs_evict_inode(struct inode *inode)  }  static inline void -hugetlb_vmtruncate_list(struct prio_tree_root *root, pgoff_t pgoff) +hugetlb_vmtruncate_list(struct rb_root *root, pgoff_t pgoff)  {  	struct vm_area_struct *vma; -	struct prio_tree_iter iter; -	vma_prio_tree_foreach(vma, &iter, root, pgoff, ULONG_MAX) { +	vma_interval_tree_foreach(vma, root, pgoff, ULONG_MAX) {  		unsigned long v_offset;  		/*  		 * Can the expression below overflow on 32-bit arches? -		 * No, because the prio_tree returns us only those vmas +		 * No, because the interval tree returns us only those vmas  		 * which overlap the truncated area starting at pgoff,  		 * and no vma on a 32-bit arch can span beyond the 4GB.  		 */ @@ -432,7 +431,7 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)  	i_size_write(inode, offset);  	mutex_lock(&mapping->i_mmap_mutex); -	if (!prio_tree_empty(&mapping->i_mmap)) +	if (!RB_EMPTY_ROOT(&mapping->i_mmap))  		hugetlb_vmtruncate_list(&mapping->i_mmap, pgoff);  	mutex_unlock(&mapping->i_mmap_mutex);  	truncate_hugepages(inode, offset);  |