--- fs/ext4/file.c

+++ fs/ext4/file.c

@@ -35,9 +35,9 @@

*/

static int ext4_release_file(struct inode *inode, struct file *filp)

{

- if (EXT4_I(inode)->i_state & EXT4_STATE_DA_ALLOC_CLOSE) {

+ if (ext4_test_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE)) {

ext4_alloc_da_blocks(inode);

- EXT4_I(inode)->i_state &= ~EXT4_STATE_DA_ALLOC_CLOSE;

+ ext4_clear_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);

}

/* if we are the last writer on the inode, drop the block reservation */

if ((filp->f_mode & FMODE_WRITE) &&

@@ -65,7 +65,7 @@ ext4_file_write(struct kiocb *iocb, cons

* is smaller than s_maxbytes, which is for extent-mapped files.

*/

- if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)) {

+ if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {

struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

size_t length = iov_length(iov, nr_segs);