@@ -943,10 +943,13 @@ static noinline int cow_file_range(struct inode *inode,
943943 u64 num_bytes ;
944944 unsigned long ram_size ;
945945 u64 disk_num_bytes ;
946- u64 cur_alloc_size ;
946+ u64 cur_alloc_size = 0 ;
947947 u64 blocksize = fs_info -> sectorsize ;
948948 struct btrfs_key ins ;
949949 struct extent_map * em ;
950+ unsigned clear_bits ;
951+ unsigned long page_ops ;
952+ bool extent_reserved = false;
950953 int ret = 0 ;
951954
952955 if (btrfs_is_free_space_inode (BTRFS_I (inode ))) {
@@ -991,14 +994,14 @@ static noinline int cow_file_range(struct inode *inode,
991994 start + num_bytes - 1 , 0 );
992995
993996 while (disk_num_bytes > 0 ) {
994- unsigned long op ;
995-
996997 cur_alloc_size = disk_num_bytes ;
997998 ret = btrfs_reserve_extent (root , cur_alloc_size , cur_alloc_size ,
998999 fs_info -> sectorsize , 0 , alloc_hint ,
9991000 & ins , 1 , 1 );
10001001 if (ret < 0 )
10011002 goto out_unlock ;
1003+ cur_alloc_size = ins .offset ;
1004+ extent_reserved = true;
10021005
10031006 ram_size = ins .offset ;
10041007 em = create_io_em (inode , start , ins .offset , /* len */
@@ -1013,7 +1016,6 @@ static noinline int cow_file_range(struct inode *inode,
10131016 goto out_reserve ;
10141017 free_extent_map (em );
10151018
1016- cur_alloc_size = ins .offset ;
10171019 ret = btrfs_add_ordered_extent (inode , start , ins .objectid ,
10181020 ram_size , cur_alloc_size , 0 );
10191021 if (ret )
@@ -1048,21 +1050,22 @@ static noinline int cow_file_range(struct inode *inode,
10481050 * Do set the Private2 bit so we know this page was properly
10491051 * setup for writepage
10501052 */
1051- op = unlock ? PAGE_UNLOCK : 0 ;
1052- op |= PAGE_SET_PRIVATE2 ;
1053+ page_ops = unlock ? PAGE_UNLOCK : 0 ;
1054+ page_ops |= PAGE_SET_PRIVATE2 ;
10531055
10541056 extent_clear_unlock_delalloc (inode , start ,
10551057 start + ram_size - 1 ,
10561058 delalloc_end , locked_page ,
10571059 EXTENT_LOCKED | EXTENT_DELALLOC ,
1058- op );
1060+ page_ops );
10591061 if (disk_num_bytes < cur_alloc_size )
10601062 disk_num_bytes = 0 ;
10611063 else
10621064 disk_num_bytes -= cur_alloc_size ;
10631065 num_bytes -= cur_alloc_size ;
10641066 alloc_hint = ins .objectid + ins .offset ;
10651067 start += cur_alloc_size ;
1068+ extent_reserved = false;
10661069
10671070 /*
10681071 * btrfs_reloc_clone_csums() error, since start is increased
@@ -1081,12 +1084,35 @@ static noinline int cow_file_range(struct inode *inode,
10811084 btrfs_dec_block_group_reservations (fs_info , ins .objectid );
10821085 btrfs_free_reserved_extent (fs_info , ins .objectid , ins .offset , 1 );
10831086out_unlock :
1087+ clear_bits = EXTENT_LOCKED | EXTENT_DELALLOC | EXTENT_DEFRAG |
1088+ EXTENT_CLEAR_META_RESV ;
1089+ page_ops = PAGE_UNLOCK | PAGE_CLEAR_DIRTY | PAGE_SET_WRITEBACK |
1090+ PAGE_END_WRITEBACK ;
1091+ /*
1092+ * If we reserved an extent for our delalloc range (or a subrange) and
1093+ * failed to create the respective ordered extent, then it means that
1094+ * when we reserved the extent we decremented the extent's size from
1095+ * the data space_info's bytes_may_use counter and incremented the
1096+ * space_info's bytes_reserved counter by the same amount. We must make
1097+ * sure extent_clear_unlock_delalloc() does not try to decrement again
1098+ * the data space_info's bytes_may_use counter, therefore we do not pass
1099+ * it the flag EXTENT_CLEAR_DATA_RESV.
1100+ */
1101+ if (extent_reserved ) {
1102+ extent_clear_unlock_delalloc (inode , start ,
1103+ start + cur_alloc_size ,
1104+ start + cur_alloc_size ,
1105+ locked_page ,
1106+ clear_bits ,
1107+ page_ops );
1108+ start += cur_alloc_size ;
1109+ if (start >= end )
1110+ goto out ;
1111+ }
10841112 extent_clear_unlock_delalloc (inode , start , end , delalloc_end ,
10851113 locked_page ,
1086- EXTENT_LOCKED | EXTENT_DO_ACCOUNTING |
1087- EXTENT_DELALLOC | EXTENT_DEFRAG ,
1088- PAGE_UNLOCK | PAGE_CLEAR_DIRTY |
1089- PAGE_SET_WRITEBACK | PAGE_END_WRITEBACK );
1114+ clear_bits | EXTENT_CLEAR_DATA_RESV ,
1115+ page_ops );
10901116 goto out ;
10911117}
10921118
@@ -1776,7 +1802,7 @@ static void btrfs_clear_bit_hook(struct btrfs_inode *inode,
17761802
17771803 if (* bits & EXTENT_FIRST_DELALLOC ) {
17781804 * bits &= ~EXTENT_FIRST_DELALLOC ;
1779- } else if (!(* bits & EXTENT_DO_ACCOUNTING )) {
1805+ } else if (!(* bits & EXTENT_CLEAR_META_RESV )) {
17801806 spin_lock (& inode -> lock );
17811807 inode -> outstanding_extents -= num_extents ;
17821808 spin_unlock (& inode -> lock );
@@ -1787,18 +1813,17 @@ static void btrfs_clear_bit_hook(struct btrfs_inode *inode,
17871813 * don't need to call dellalloc_release_metadata if there is an
17881814 * error.
17891815 */
1790- if (* bits & EXTENT_DO_ACCOUNTING &&
1816+ if (* bits & EXTENT_CLEAR_META_RESV &&
17911817 root != fs_info -> tree_root )
17921818 btrfs_delalloc_release_metadata (inode , len );
17931819
17941820 /* For sanity tests. */
17951821 if (btrfs_is_testing (fs_info ))
17961822 return ;
17971823
1798- if (root -> root_key .objectid != BTRFS_DATA_RELOC_TREE_OBJECTID
1799- && do_list && !(state -> state & EXTENT_NORESERVE )
1800- && (* bits & (EXTENT_DO_ACCOUNTING |
1801- EXTENT_CLEAR_DATA_RESV )))
1824+ if (root -> root_key .objectid != BTRFS_DATA_RELOC_TREE_OBJECTID &&
1825+ do_list && !(state -> state & EXTENT_NORESERVE ) &&
1826+ (* bits & EXTENT_CLEAR_DATA_RESV ))
18021827 btrfs_free_reserved_data_space_noquota (
18031828 & inode -> vfs_inode ,
18041829 state -> start , len );
0 commit comments