diff options
| author | Jan Kara <jack@suse.cz> | 2016-03-09 23:03:27 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-03-09 23:03:27 -0500 |
| commit | e3fb8eb14eafd2847c04cf48b52a705c36f4db98 (patch) | |
| tree | df595ad9bd1be63bca5923955b2bb95a9f156c3f /fs/ext4 | |
| parent | facab4d9711e7aa3532cb82643803e8f1b9518e8 (diff) | |
| download | linux-e3fb8eb14eafd2847c04cf48b52a705c36f4db98.tar.gz linux-e3fb8eb14eafd2847c04cf48b52a705c36f4db98.tar.bz2 linux-e3fb8eb14eafd2847c04cf48b52a705c36f4db98.zip | |
ext4: cleanup handling of bh->b_state in DAX mmap
ext4_dax_mmap_get_block() updates bh->b_state directly instead of using
ext4_update_bh_state(). This is mostly a cosmetic issue since DAX code
always passes on-stack buffer_head but clean this up to make code more
uniform.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 1a156ec043a0..fddc6ddc53a8 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3272,13 +3272,12 @@ out: WARN_ON_ONCE(ret == 0 && create); if (ret > 0) { map_bh(bh_result, inode->i_sb, map.m_pblk); - bh_result->b_state = (bh_result->b_state & ~EXT4_MAP_FLAGS) | - map.m_flags; /* * At least for now we have to clear BH_New so that DAX code * doesn't attempt to zero blocks again in a racy way. */ - bh_result->b_state &= ~(1 << BH_New); + map.m_flags &= ~EXT4_MAP_NEW; + ext4_update_bh_state(bh_result, map.m_flags); bh_result->b_size = map.m_len << inode->i_blkbits; ret = 0; } |