1 files changed, 17 insertions, 6 deletions

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index c8c1d6cc6e5d..132fb92098c7 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -187,14 +187,15 @@ static int journal_wait_on_commit_record(journal_t *journal,
  * use writepages() because with delayed allocation we may be doing
  * block allocation in writepages().
  */
-static int journal_submit_inode_data_buffers(struct address_space *mapping)
+static int journal_submit_inode_data_buffers(struct address_space *mapping,
+                loff_t dirty_start, loff_t dirty_end)
 {
         int ret;
         struct writeback_control wbc = {
                 .sync_mode =  WB_SYNC_ALL,
                 .nr_to_write = mapping->nrpages * 2,
-                .range_start = 0,
-                .range_end = i_size_read(mapping->host),
+                .range_start = dirty_start,
+                .range_end = dirty_end,
         };
 
         ret = generic_writepages(mapping, &wbc);
@@ -218,6 +219,9 @@ static int journal_submit_data_buffers(journal_t *journal,
 
         spin_lock(&journal->j_list_lock);
         list_for_each_entry(jinode, &commit_transaction->t_inode_list, i_list) {
+                loff_t dirty_start = jinode->i_dirty_start;
+                loff_t dirty_end = jinode->i_dirty_end;
+
                 if (!(jinode->i_flags & JI_WRITE_DATA))
                         continue;
                 mapping = jinode->i_vfs_inode->i_mapping;
@@ -230,7 +234,8 @@ static int journal_submit_data_buffers(journal_t *journal,
                  * only allocated blocks here.
                  */
                 trace_jbd2_submit_inode_data(jinode->i_vfs_inode);
-                err = journal_submit_inode_data_buffers(mapping);
+                err = journal_submit_inode_data_buffers(mapping, dirty_start,
+                                dirty_end);
                 if (!ret)
                         ret = err;
                 spin_lock(&journal->j_list_lock);
@@ -257,12 +262,16 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
         /* For locking, see the comment in journal_submit_data_buffers() */
         spin_lock(&journal->j_list_lock);
         list_for_each_entry(jinode, &commit_transaction->t_inode_list, i_list) {
+                loff_t dirty_start = jinode->i_dirty_start;
+                loff_t dirty_end = jinode->i_dirty_end;
+
                 if (!(jinode->i_flags & JI_WAIT_DATA))
                         continue;
                 jinode->i_flags |= JI_COMMIT_RUNNING;
                 spin_unlock(&journal->j_list_lock);
-                err = filemap_fdatawait_keep_errors(
-                                jinode->i_vfs_inode->i_mapping);
+                err = filemap_fdatawait_range_keep_errors(
+                                jinode->i_vfs_inode->i_mapping, dirty_start,
+                                dirty_end);
                 if (!ret)
                         ret = err;
                 spin_lock(&journal->j_list_lock);
@@ -282,6 +291,8 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
                                 &jinode->i_transaction->t_inode_list);
                 } else {
                         jinode->i_transaction = NULL;
+                        jinode->i_dirty_start = 0;
+                        jinode->i_dirty_end = 0;
                 }
         }
         spin_unlock(&journal->j_list_lock);