diff options
| author | Jan Kara <jack@suse.cz> | 2016-04-24 00:56:05 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-04-24 00:56:05 -0400 |
| commit | 3957ef53a5033bd519b19cf375061be1929bdb5f (patch) | |
| tree | 5110c15e5d91514ce94a1d6468e0b4d6154eb31b | |
| parent | 06bd3c36a733ac27962fea7d6f47168841376824 (diff) | |
| download | op-kernel-dev-3957ef53a5033bd519b19cf375061be1929bdb5f.zip op-kernel-dev-3957ef53a5033bd519b19cf375061be1929bdb5f.tar.gz | |
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: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/ext4.h | 1 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 349afeb..f75e9eb 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -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 */ }; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 250c2df..8ba46ad 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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); } |
