Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3957ef53 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: remove EXT4_STATE_ORDERED_MODE 



This flag is just duplicating what ext4_should_order_data() tells you
and is used in a single place. Furthermore it doesn't reflect changes to
inode data journalling flag so it may be possibly misleading. Just
remove it.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 06bd3c36

fs/ext4/ext4.h

+0 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,6 @@ enum { 
	EXT4_STATE_DIOREAD_LOCK,	/* Disable support for dio read

					   nolocking */

	EXT4_STATE_MAY_INLINE_DATA,	/* may have in-inode data */

	EXT4_STATE_ORDERED_MODE,	/* data=ordered mode */

	EXT4_STATE_EXT_PRECACHED,	/* extents have been precached */

};

fs/ext4/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -3540,10 +3540,7 @@ void ext4_set_aops(struct inode *inode) 
{

	switch (ext4_inode_journal_mode(inode)) {

	case EXT4_INODE_ORDERED_DATA_MODE:

		ext4_set_inode_state(inode, EXT4_STATE_ORDERED_MODE);

		break;

	case EXT4_INODE_WRITEBACK_DATA_MODE:

		ext4_clear_inode_state(inode, EXT4_STATE_ORDERED_MODE);

		break;

	case EXT4_INODE_JOURNAL_DATA_MODE:

		inode->i_mapping->a_ops = &ext4_journalled_aops;
@@ -3636,7 +3633,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, 
	} else {

		err = 0;

		mark_buffer_dirty(bh);

		if (ext4_test_inode_state(inode, EXT4_STATE_ORDERED_MODE))

		if (ext4_should_order_data(inode))

			err = ext4_jbd2_file_inode(handle, inode);

	}