| @@ -526,20 +526,26 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, · 525 unmodified lines |
| 526 | 526 | retval = ext4_ind_map_blocks(handle, inode, map, flags & |
| 527 | 527 | EXT4_GET_BLOCKS_KEEP_SIZE); |
| 528 | 528 | } |
| 529 | + if (retval > 0) { |
| 530 | + int ret; |
| 531 | + unsigned long long status; |
| 532 | + |
| 533 | + status = map->m_flags & EXT4_MAP_UNWRITTEN ? |
| 534 | + EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; |
| 535 | + if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && |
| 536 | + ext4_find_delalloc_range(inode, map->m_lblk, |
| 537 | + map->m_lblk + map->m_len - 1)) |
| 538 | + status |= EXTENT_STATUS_DELAYED; |
| 539 | + ret = ext4_es_insert_extent(inode, map->m_lblk, |
| 540 | + map->m_len, map->m_pblk, status); |
| 541 | + if (ret < 0) |
| 542 | + retval = ret; |
| 543 | + } |
| 529 | 544 | if (!(flags & EXT4_GET_BLOCKS_NO_LOCK)) |
| 530 | 545 | up_read((&EXT4_I(inode)->i_data_sem)); |
| 531 | 546 | |
| 532 | 547 | if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { |
| 533 | | − int ret; |
| 534 | | − if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) { |
| 535 | | − /* delayed alloc may be allocated by fallocate and |
| 536 | | − * coverted to initialized by directIO. |
| 537 | | − * we need to handle delayed extent here. |
| 538 | | − */ |
| 539 | | − down_write((&EXT4_I(inode)->i_data_sem)); |
| 540 | | − goto delayed_mapped; |
| 541 | | − } |
| 542 | | − ret = check_block_validity(inode, map); |
| 548 | + int ret = check_block_validity(inode, map); |
| 543 | 549 | if (ret != 0) |
| 544 | 550 | return ret; |
| 545 | 551 | } |
| @@ -608,18 +614,23 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, · 62 unmodified lines |
| 608 | 614 | (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)) |
| 609 | 615 | ext4_da_update_reserve_space(inode, retval, 1); |
| 610 | 616 | } |
| 611 | | − if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) { |
| 617 | + if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) |
| 612 | 618 | ext4_clear_inode_state(inode, EXT4_STATE_DELALLOC_RESERVED); |
| 613 | 619 | |
| 614 | | − if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) { |
| 615 | | − int ret; |
| 616 | | −delayed_mapped: |
| 617 | | − /* delayed allocation blocks has been allocated */ |
| 618 | | − ret = ext4_es_remove_extent(inode, map->m_lblk, |
| 619 | | − map->m_len); |
| 620 | | − if (ret < 0) |
| 621 | | − retval = ret; |
| 622 | | − } |
| 620 | + if (retval > 0) { |
| 621 | + int ret; |
| 622 | + unsigned long long status; |
| 623 | + |
| 624 | + status = map->m_flags & EXT4_MAP_UNWRITTEN ? |
| 625 | + EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; |
| 626 | + if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && |
| 627 | + ext4_find_delalloc_range(inode, map->m_lblk, |
| 628 | + map->m_lblk + map->m_len - 1)) |
| 629 | + status |= EXTENT_STATUS_DELAYED; |
| 630 | + ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, |
| 631 | + map->m_pblk, status); |
| 632 | + if (ret < 0) |
| 633 | + retval = ret; |
| 623 | 634 | } |
| 624 | 635 | |
| 625 | 636 | up_write((&EXT4_I(inode)->i_data_sem)); |
| @@ -1765,6 +1776,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, · 1139 unmodified lines |
| 1765 | 1776 | retval = ext4_ind_map_blocks(NULL, inode, map, 0); |
| 1766 | 1777 | |
| 1767 | 1778 | if (retval == 0) { |
| 1779 | + int ret; |
| 1768 | 1780 | /* |
| 1769 | 1781 | * XXX: __block_prepare_write() unmaps passed block, |
| 1770 | 1782 | * is it OK? |
| @@ -1772,16 +1784,20 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, · 1 unmodified line |
| 1772 | 1784 | /* If the block was allocated from previously allocated cluster, |
| 1773 | 1785 | * then we dont need to reserve it again. */ |
| 1774 | 1786 | if (!(map->m_flags & EXT4_MAP_FROM_CLUSTER)) { |
| 1775 | | − retval = ext4_da_reserve_space(inode, iblock); |
| 1776 | | − if (retval) |
| 1787 | + ret = ext4_da_reserve_space(inode, iblock); |
| 1788 | + if (ret) { |
| 1777 | 1789 | /* not enough space to reserve */ |
| 1790 | + retval = ret; |
| 1778 | 1791 | goto out_unlock; |
| 1792 | + } |
| 1779 | 1793 | } |
| 1780 | 1794 | |
| 1781 | | − retval = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, |
| 1782 | | − ~0, EXTENT_STATUS_DELAYED); |
| 1783 | | − if (retval) |
| 1795 | + ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, |
| 1796 | + ~0, EXTENT_STATUS_DELAYED); |
| 1797 | + if (ret) { |
| 1798 | + retval = ret; |
| 1784 | 1799 | goto out_unlock; |
| 1800 | + } |
| 1785 | 1801 | |
| 1786 | 1802 | /* Clear EXT4_MAP_FROM_CLUSTER flag since its purpose is served |
| 1787 | 1803 | * and it should not appear on the bh->b_state. |
| @@ -1791,6 +1807,16 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, · 3 unmodified lines |
| 1791 | 1807 | map_bh(bh, inode->i_sb, invalid_block); |
| 1792 | 1808 | set_buffer_new(bh); |
| 1793 | 1809 | set_buffer_delay(bh); |
| 1810 | + } else if (retval > 0) { |
| 1811 | + int ret; |
| 1812 | + unsigned long long status; |
| 1813 | + |
| 1814 | + status = map->m_flags & EXT4_MAP_UNWRITTEN ? |
| 1815 | + EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; |
| 1816 | + ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, |
| 1817 | + map->m_pblk, status); |
| 1818 | + if (ret != 0) |
| 1819 | + retval = ret; |
| 1794 | 1820 | } |
| 1795 | 1821 | |
| 1796 | 1822 | out_unlock: |