f2fs: fix ICE support

With Linux 5.5's f2fs, commit 47c6872 ("f2fs: cache global IPU bio")
has caused merge conflict with commit 646f671b91fcf ("f2fs: Fix data corruption issue with FBE")
and was improperly resolved.

Fix it properly and fix data corruptions and kernel panics.

Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

fs/f2fs/data.c

@@ -776,7 +776,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
 	/* ICE support */
 	if (bio && !fscrypt_mergeable_bio(bio, dun,
 				bio_encrypted, bi_crypt_skip))
-		__submit_bio(fio->sbi, bio, fio->type);
+		f2fs_submit_merged_ipu_write(fio->sbi, &bio, NULL);
 
 alloc_new:
 	if (!bio) {