On Thu, Jun 11, 2026 at 02:18:57PM +0800, Huang Shijie wrote: > Use mapping_mapped() to simplify the code, make > the code tidy and clean. > > Signed-off-by: Huang Shijie <[email protected]>
Yeah as Pedro said this one could just be sent separately, and I in fact suggest you do that :) So: Reviewed-by: Lorenzo Stoakes <[email protected]> Cheers, Lorenzo > --- > fs/hugetlbfs/inode.c | 4 ++-- > mm/memory.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index 78d61bf2bd9b..216e1a0dd0b2 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -614,7 +614,7 @@ static void hugetlb_vmtruncate(struct inode *inode, > loff_t offset) > > i_size_write(inode, offset); > i_mmap_lock_write(mapping); > - if (!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root)) > + if (mapping_mapped(mapping)) > hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0, > ZAP_FLAG_DROP_MARKER); > i_mmap_unlock_write(mapping); > @@ -675,7 +675,7 @@ static long hugetlbfs_punch_hole(struct inode *inode, > loff_t offset, loff_t len) > > /* Unmap users of full pages in the hole. */ > if (hole_end > hole_start) { > - if (!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root)) > + if (mapping_mapped(mapping)) > hugetlb_vmdelete_list(&mapping->i_mmap, > hole_start >> PAGE_SHIFT, > hole_end >> PAGE_SHIFT, 0); > diff --git a/mm/memory.c b/mm/memory.c > index 86a973119bd4..5335077765e2 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4386,7 +4386,7 @@ void unmap_mapping_folio(struct folio *folio) > details.zap_flags = ZAP_FLAG_DROP_MARKER; > > i_mmap_lock_read(mapping); > - if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root))) > + if (unlikely(mapping_mapped(mapping))) > unmap_mapping_range_tree(&mapping->i_mmap, first_index, > last_index, &details); > i_mmap_unlock_read(mapping); > @@ -4416,7 +4416,7 @@ void unmap_mapping_pages(struct address_space *mapping, > pgoff_t start, > last_index = ULONG_MAX; > > i_mmap_lock_read(mapping); > - if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root))) > + if (unlikely(mapping_mapped(mapping))) > unmap_mapping_range_tree(&mapping->i_mmap, first_index, > last_index, &details); > i_mmap_unlock_read(mapping); > -- > 2.53.0 > >
