3 files changed, 2 insertions, 21 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 240b6dea5441..82e239a176c7 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4048,18 +4048,8 @@ out:
         } else
                 allocated = ret;
         map->m_flags |= EXT4_MAP_NEW;
-        /*
-         * if we allocated more blocks than requested
-         * we need to make sure we unmap the extra block
-         * allocated. The actual needed block will get
-         * unmapped later when we find the buffer_head marked
-         * new.
-         */
-        if (allocated > map->m_len) {
-                clean_bdev_aliases(inode->i_sb->s_bdev, newblock + map->m_len,
-                                   allocated - map->m_len);
+        if (allocated > map->m_len)
                 allocated = map->m_len;
-        }
         map->m_len = allocated;
 
 map_out:
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 213d1857a7cf..dd4641f3cdb9 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -678,8 +678,6 @@ found:
                 if (flags & EXT4_GET_BLOCKS_ZERO &&
                     map->m_flags & EXT4_MAP_MAPPED &&
                     map->m_flags & EXT4_MAP_NEW) {
-                        clean_bdev_aliases(inode->i_sb->s_bdev, map->m_pblk,
-                                           map->m_len);
                         ret = ext4_issue_zeroout(inode, map->m_lblk,
                                                  map->m_pblk, map->m_len);
                         if (ret) {
@@ -1194,7 +1192,6 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,
                         if (err)
                                 break;
                         if (buffer_new(bh)) {
-                                clean_bdev_bh_alias(bh);
                                 if (PageUptodate(page)) {
                                         clear_buffer_new(bh);
                                         set_buffer_uptodate(bh);
@@ -2490,10 +2487,6 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)
         }
 
         BUG_ON(map->m_len == 0);
-        if (map->m_flags & EXT4_MAP_NEW) {
-                clean_bdev_aliases(inode->i_sb->s_bdev, map->m_pblk,
-                                   map->m_len);
-        }
         return 0;
 }
 
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 2aa62d58d8dd..15599466809b 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -467,10 +467,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
                                 ext4_io_submit(io);
                         continue;
                 }
-                if (buffer_new(bh)) {
+                if (buffer_new(bh))
                         clear_buffer_new(bh);
-                        clean_bdev_bh_alias(bh);
-                }
                 set_buffer_async_write(bh);
                 nr_to_submit++;
         } while ((bh = bh->b_this_page) != head);