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

gregkh · gregkh · commit c127e59bee3e · 2018-09-27T21:16:24.000+02:00
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
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
@@ -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;
 	

Original file line number	Diff line number	Diff line change
`@@ -1448,6 +1448,7 @@ struct inode ext2_iget (struct super_block sb, unsigned long ino)`
`1448`	`1448`	`}`
`1449`	`1449`	`inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);`
`1450`	`1450`	`ei->i_flags = le32_to_cpu(raw_inode->i_flags);`
	`1451`	`+ ext2_set_inode_flags(inode);`
`1451`	`1452`	`ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);`
`1452`	`1453`	`ei->i_frag_no = raw_inode->i_frag;`
`1453`	`1454`	`ei->i_frag_size = raw_inode->i_fsize;`
`@@ -1517,7 +1518,6 @@ struct inode ext2_iget (struct super_block sb, unsigned long ino)`
`1517`	`1518`	`new_decode_dev(le32_to_cpu(raw_inode->i_block[1])));`
`1518`	`1519`	`}`
`1519`	`1520`	`brelse (bh);`
`1520`		`- ext2_set_inode_flags(inode);`
`1521`	`1521`	`unlock_new_inode(inode);`
`1522`	`1522`	`return inode;`
`1523`	`1523`