ext4: use jbd2_inode dirty range scoping (73131fbb) · Commits · 戴 / test

fs/ext4/ext4_jbd2.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}

+10 −3

Original line number	Diff line number	Diff line
		@@ -731,10 +731,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;
		}
		@@ -4085,7 +4091,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:

+2 −1

Original line number	Diff line number	Diff line
		@@ -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]);