ext4: use jbd2_inode dirty range scoping

commit 73131fbb003b3691cfcf9656f234b00da497fcd6 upstream.

Use the newly introduced jbd2_inode dirty range scoping to prevent us
from waiting forever when trying to complete a journal transaction.

Signed-off-by: Ross Zwisler <zwisler@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h
index df908ef..402dc36 100644 (file)
--- a/fs/ext4/ext4_jbd2.h
+++ b/fs/ext4/ext4_jbd2.h
@@ -361,20 +361,20 @@ static inline int ext4_journal_force_commit(journal_t *journal)
 }
 
 static inline int ext4_jbd2_inode_add_write(handle_t *handle,
-                                           struct inode *inode)
+               struct inode *inode, loff_t start_byte, loff_t length)
 {
        if (ext4_handle_valid(handle))
-               return jbd2_journal_inode_add_write(handle,
-                                                   EXT4_I(inode)->jinode);
+               return jbd2_journal_inode_ranged_write(handle,
+                               EXT4_I(inode)->jinode, start_byte, length);
        return 0;
 }
 
 static inline int ext4_jbd2_inode_add_wait(handle_t *handle,
-                                          struct inode *inode)
+               struct inode *inode, loff_t start_byte, loff_t length)
 {
        if (ext4_handle_valid(handle))
-               return jbd2_journal_inode_add_wait(handle,
-                                                  EXT4_I(inode)->jinode);
+               return jbd2_journal_inode_ranged_wait(handle,
+                               EXT4_I(inode)->jinode, start_byte, length);
        return 0;
 }
 

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index db318b5..e65559b 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -729,10 +729,16 @@ out_sem:
                    !(flags & EXT4_GET_BLOCKS_ZERO) &&
                    !ext4_is_quota_file(inode) &&
                    ext4_should_order_data(inode)) {
+                       loff_t start_byte =
+                               (loff_t)map->m_lblk << inode->i_blkbits;
+                       loff_t length = (loff_t)map->m_len << inode->i_blkbits;
+
                        if (flags & EXT4_GET_BLOCKS_IO_SUBMIT)
-                               ret = ext4_jbd2_inode_add_wait(handle, inode);
+                               ret = ext4_jbd2_inode_add_wait(handle, inode,
+                                               start_byte, length);
                        else
-                               ret = ext4_jbd2_inode_add_write(handle, inode);
+                               ret = ext4_jbd2_inode_add_write(handle, inode,
+                                               start_byte, length);
                        if (ret)
                                return ret;
                }
@@ -4058,7 +4064,8 @@ static int __ext4_block_zero_page_range(handle_t *handle,
                err = 0;
                mark_buffer_dirty(bh);
                if (ext4_should_order_data(inode))
-                       err = ext4_jbd2_inode_add_write(handle, inode);
+                       err = ext4_jbd2_inode_add_write(handle, inode, from,
+                                       length);
        }
 
 unlock:

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 2f5be02..287631b 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -390,7 +390,8 @@ data_copy:
 
        /* Even in case of data=writeback it is reasonable to pin
         * inode to transaction, to prevent unexpected data loss */
-       *err = ext4_jbd2_inode_add_write(handle, orig_inode);
+       *err = ext4_jbd2_inode_add_write(handle, orig_inode,
+                       (loff_t)orig_page_offset << PAGE_SHIFT, replaced_size);
 
 unlock_pages:
        unlock_page(pagep[0]);