1 files changed, 18 insertions, 4 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 41f8e55afcd1..cecf9aa10811 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1323,7 +1323,7 @@ static void ext4_da_page_release_reservation(struct page *page,
                                              unsigned int offset,
                                              unsigned int length)
 {
-        int to_release = 0;
+        int to_release = 0, contiguous_blks = 0;
         struct buffer_head *head, *bh;
         unsigned int curr_off = 0;
         struct inode *inode = page->mapping->host;
@@ -1344,14 +1344,23 @@ static void ext4_da_page_release_reservation(struct page *page,
 
                 if ((offset <= curr_off) && (buffer_delay(bh))) {
                         to_release++;
+                        contiguous_blks++;
                         clear_buffer_delay(bh);
+                } else if (contiguous_blks) {
+                        lblk = page->index <<
+                               (PAGE_CACHE_SHIFT - inode->i_blkbits);
+                        lblk += (curr_off >> inode->i_blkbits) -
+                                contiguous_blks;
+                        ext4_es_remove_extent(inode, lblk, contiguous_blks);
+                        contiguous_blks = 0;
                 }
                 curr_off = next_off;
         } while ((bh = bh->b_this_page) != head);
 
-        if (to_release) {
+        if (contiguous_blks) {
                 lblk = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
-                ext4_es_remove_extent(inode, lblk, to_release);
+                lblk += (curr_off >> inode->i_blkbits) - contiguous_blks;
+                ext4_es_remove_extent(inode, lblk, contiguous_blks);
         }
 
         /* If we have released all the blocks belonging to a cluster, then we
@@ -4344,7 +4353,12 @@ static void ext4_update_other_inodes_time(struct super_block *sb,
         int inode_size = EXT4_INODE_SIZE(sb);
 
         oi.orig_ino = orig_ino;
-        ino = (orig_ino & ~(inodes_per_block - 1)) + 1;
+        /*
+         * Calculate the first inode in the inode table block.  Inode
+         * numbers are one-based.  That is, the first inode in a block
+         * (assuming 4k blocks and 256 byte inodes) is (n*16 + 1).
+         */
+        ino = ((orig_ino - 1) & ~(inodes_per_block - 1)) + 1;
         for (i = 0; i < inodes_per_block; i++, ino++, buf += inode_size) {
                 if (ino == orig_ino)
                         continue;