@@ -1022,11 +1022,11 @@ bool btrfs_find_delalloc_range(struct extent_io_tree *tree, u64 *start,
10221022 *
10231023 * [start, end] is inclusive This takes the tree lock.
10241024 */
1025- static int __set_extent_bit (struct extent_io_tree * tree , u64 start , u64 end ,
1026- u32 bits , u64 * failed_start ,
1027- struct extent_state * * failed_state ,
1028- struct extent_state * * cached_state ,
1029- struct extent_changeset * changeset )
1025+ static int set_extent_bit (struct extent_io_tree * tree , u64 start , u64 end ,
1026+ u32 bits , u64 * failed_start ,
1027+ struct extent_state * * failed_state ,
1028+ struct extent_state * * cached_state ,
1029+ struct extent_changeset * changeset )
10301030{
10311031 struct extent_state * state ;
10321032 struct extent_state * prealloc = NULL ;
@@ -1258,8 +1258,7 @@ static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
12581258int btrfs_set_extent_bit (struct extent_io_tree * tree , u64 start , u64 end ,
12591259 u32 bits , struct extent_state * * cached_state )
12601260{
1261- return __set_extent_bit (tree , start , end , bits , NULL , NULL ,
1262- cached_state , NULL );
1261+ return set_extent_bit (tree , start , end , bits , NULL , NULL , cached_state , NULL );
12631262}
12641263
12651264/*
@@ -1815,7 +1814,7 @@ int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end
18151814 */
18161815 ASSERT (!(bits & EXTENT_LOCK_BITS ));
18171816
1818- return __set_extent_bit (tree , start , end , bits , NULL , NULL , NULL , changeset );
1817+ return set_extent_bit (tree , start , end , bits , NULL , NULL , NULL , changeset );
18191818}
18201819
18211820int btrfs_clear_record_extent_bits (struct extent_io_tree * tree , u64 start , u64 end ,
@@ -1836,8 +1835,8 @@ bool btrfs_try_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
18361835 int err ;
18371836 u64 failed_start ;
18381837
1839- err = __set_extent_bit (tree , start , end , bits , & failed_start ,
1840- NULL , cached , NULL );
1838+ err = set_extent_bit (tree , start , end , bits , & failed_start , NULL ,
1839+ cached , NULL );
18411840 if (err == - EEXIST ) {
18421841 if (failed_start > start )
18431842 btrfs_clear_extent_bit (tree , start , failed_start - 1 ,
@@ -1858,17 +1857,16 @@ int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32
18581857 int err ;
18591858 u64 failed_start ;
18601859
1861- err = __set_extent_bit (tree , start , end , bits , & failed_start ,
1862- & failed_state , cached_state , NULL );
1860+ err = set_extent_bit (tree , start , end , bits , & failed_start ,
1861+ & failed_state , cached_state , NULL );
18631862 while (err == - EEXIST ) {
18641863 if (failed_start != start )
18651864 btrfs_clear_extent_bit (tree , start , failed_start - 1 ,
18661865 bits , cached_state );
18671866
18681867 wait_extent_bit (tree , failed_start , end , bits , & failed_state );
1869- err = __set_extent_bit (tree , start , end , bits ,
1870- & failed_start , & failed_state ,
1871- cached_state , NULL );
1868+ err = set_extent_bit (tree , start , end , bits , & failed_start ,
1869+ & failed_state , cached_state , NULL );
18721870 }
18731871 return err ;
18741872}
0 commit comments