1 files changed, 7 insertions, 30 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3356ab5395f4..5653fa42930b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -416,11 +416,6 @@ static void ext4_map_blocks_es_recheck(handle_t *handle,
         }
         if (!(flags & EXT4_GET_BLOCKS_NO_LOCK))
                 up_read((&EXT4_I(inode)->i_data_sem));
-        /*
-         * Clear EXT4_MAP_FROM_CLUSTER and EXT4_MAP_BOUNDARY flag
-         * because it shouldn't be marked in es_map->m_flags.
-         */
-        map->m_flags &= ~(EXT4_MAP_FROM_CLUSTER | EXT4_MAP_BOUNDARY);
 
         /*
          * We don't check m_len because extent will be collpased in status
@@ -491,7 +486,6 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
 
         /* Lookup extent status tree firstly */
         if (ext4_es_lookup_extent(inode, map->m_lblk, &es)) {
-                ext4_es_lru_add(inode);
                 if (ext4_es_is_written(&es) || ext4_es_is_unwritten(&es)) {
                         map->m_pblk = ext4_es_pblock(&es) +
                                         map->m_lblk - es.es_lblk;
@@ -1393,7 +1387,6 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
 
         /* Lookup extent status tree firstly */
         if (ext4_es_lookup_extent(inode, iblock, &es)) {
-                ext4_es_lru_add(inode);
                 if (ext4_es_is_hole(&es)) {
                         retval = 0;
                         down_read(&EXT4_I(inode)->i_data_sem);
@@ -1434,24 +1427,12 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
          * file system block.
          */
         down_read(&EXT4_I(inode)->i_data_sem);
-        if (ext4_has_inline_data(inode)) {
-                /*
-                 * We will soon create blocks for this page, and let
-                 * us pretend as if the blocks aren't allocated yet.
-                 * In case of clusters, we have to handle the work
-                 * of mapping from cluster so that the reserved space
-                 * is calculated properly.
-                 */
-                if ((EXT4_SB(inode->i_sb)->s_cluster_ratio > 1) &&
-                    ext4_find_delalloc_cluster(inode, map->m_lblk))
-                        map->m_flags |= EXT4_MAP_FROM_CLUSTER;
+        if (ext4_has_inline_data(inode))
                 retval = 0;
-        } else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
-                retval = ext4_ext_map_blocks(NULL, inode, map,
-                                             EXT4_GET_BLOCKS_NO_PUT_HOLE);
+        else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
+                retval = ext4_ext_map_blocks(NULL, inode, map, 0);
         else
-                retval = ext4_ind_map_blocks(NULL, inode, map,
-                                             EXT4_GET_BLOCKS_NO_PUT_HOLE);
+                retval = ext4_ind_map_blocks(NULL, inode, map, 0);
 
 add_delayed:
         if (retval == 0) {
@@ -1465,7 +1446,8 @@ add_delayed:
                  * then we don't need to reserve it again. However we still need
                  * to reserve metadata for every block we're going to write.
                  */
-                if (!(map->m_flags & EXT4_MAP_FROM_CLUSTER)) {
+                if (EXT4_SB(inode->i_sb)->s_cluster_ratio <= 1 ||
+                    !ext4_find_delalloc_cluster(inode, map->m_lblk)) {
                         ret = ext4_da_reserve_space(inode, iblock);
                         if (ret) {
                                 /* not enough space to reserve */
@@ -1481,11 +1463,6 @@ add_delayed:
                         goto out_unlock;
                 }
 
-                /* Clear EXT4_MAP_FROM_CLUSTER flag since its purpose is served
-                 * and it should not appear on the bh->b_state.
-                 */
-                map->m_flags &= ~EXT4_MAP_FROM_CLUSTER;
-
                 map_bh(bh, inode->i_sb, invalid_block);
                 set_buffer_new(bh);
                 set_buffer_delay(bh);
@@ -3643,7 +3620,7 @@ out_stop:
          * If this was a simple ftruncate() and the file will remain alive,
          * then we need to clear up the orphan record which we created above.
          * However, if this was a real unlink then we were called by
-         * ext4_delete_inode(), and we allow that function to clean up the
+         * ext4_evict_inode(), and we allow that function to clean up the
          * orphan info for us.
          */
         if (inode->i_nlink)