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

Commit c127e59b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for_v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Jan writes:
  "an ext2 patch fixing fsync(2) for DAX mounts."

* tag 'for_v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2, dax: set ext2_dax_aops for dax files
parents c307aaf3 9e796c9d

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1448,6 +1448,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 
	}

	inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);

	ei->i_flags = le32_to_cpu(raw_inode->i_flags);

	ext2_set_inode_flags(inode);

	ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);

	ei->i_frag_no = raw_inode->i_frag;

	ei->i_frag_size = raw_inode->i_fsize;
@@ -1517,7 +1518,6 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 
			   new_decode_dev(le32_to_cpu(raw_inode->i_block[1])));

	}

	brelse (bh);

	ext2_set_inode_flags(inode);

	unlock_new_inode(inode);

	return inode;